Check storage instead of timer