Moved all actions inline