some collision changes