Added 30-day check