corrected status
refactoring