continued work on collision code