sticking to latest omv conventions