[REFACTORING] Status