Collision fixed

* Fixed the offset calculation to include which way you come from