Revert collision detection
some changes in