refactored actions