Features requested by JP Gélinas + Scheduling