move some code around in the execute action