refactoring needed
Activity