Added some collision logic