Now takes days of week and has tooltips