Refactor some code from the status + implemented a new check status method
Fixed conflicts