Modified structure to be more in line with how I understand OMS from luminous