Added collision detector and resolver