more surrogate tweaks