refactored Activities