Added firther collision detection stuff