collision works much better now