Improved collision
Merge branch 'micah' into ryland