Switch to using actions