Revert "still trying to fix collison"

This reverts commit e6768f41cc61f7d75ff88e2b53a0c0b63e47c2a6.
Revert "working on collison --- a lot"

This reverts commit 9dc0582aa4d4f8bc93c66871c99ed2b00de92b0e.