make more consistent with om style