cleaned up optiql