- Refactored activities somewhat