Adding square / circle collision detection