FIX: added back old execute plan