Added collision prevention