Updated reevaluate