Pre class updates