collision improvements work in progress