Changes in action

To make it more generic, for gui purposes.