Refactored
Changing activities