Added collision handing