Final change to collision system