refactor again and use statuses
1.0.6