Updates for CGOrigin