Improving interval, adding weekday