Changed collision detection to be more circle-oriented