collision rev02

Streamlined diagonal, added straight