refactor 2 status