Need to fix collision bug