Changed synchronized flow to single step opt, further testing