collision updates
Merge branch 'master' of github.com:q41/apc