Added circle/rect collision detection