Added collision optimization back