Rework actions a bit