Begin to add wakeup logic