This should run after execute finishes. See map in the diff.