Added small change to return vals