updated execute/finalize