Action queue: more rework