Sweep2wake changes