Post-Kendo change