Finally have decent collision detection