Fixed and implemented collision