sweep2wake: massive update, bring on par with s2w2 except algorithm