added sweep2wake
clean up