Some more Refactoring and implementing onDuty