Updated collision handling to use Origin property.