few changes to RZ funcs