-refactored activities