add collision detection back