Made some changes to collision