Changes made to fit new OW API