[WIP] Respect the position again