added date check to reduce traffic