Updating and completing before evaluation