added some collision stuff