Updates to have ending point, still crashed when reached end