Complete re-work or movement, collision fixed