Added oq implementation