removed omz and replaced with own