add status
refactring