Added better Collisions (needs debugging)