Refactored all the actions