Reworked coordinate system shifts