added some minor changes, now SAW works