activityTimeout implementation
refactorings
refactorings