Refactoring:
* checking current status