Coordinates reworked