Updates by Swpc