Need to go back through from the beginning