Follow Trebuchet changes