Change it so that offline pending is used always, then inside that we
check the remaining time