Using returnCodes returnRequest.

Using returnCodes returnRequest instead of local methods.