Update on collisionevents
Merge remote-tracking branch 'origin/gucci' into THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN