tweaks to more closely mirror opt