Fixed Collision and StateManager