Add proper rotation collision detection