mods to clarity return, conv in zmax