Refactored and added check for new request status