Redid collision again with help from Jestin