Modified for 7 days and 24 days