Did some refactoring and made it so requester and approver are not required