refactored activities