refactoring
resetting pattern
overwrite onResetListener
Merge branch 'feature-resetting' into development
refactoring