Handle status change
Refactoring
Refactoring