slight mod SAW config replace