tried to fix dwyer^op stuff