removed constants and added some collision interactions