Some collision changes