Requested changes from review