* Refactor the om code