Fixed Review

Need to work on return error -