Logic for on/off list adjusted to follow 48 hour check