some changed for the OM performance (this file will move to it's own repo)