Added my changes to Duty
short changes
...