Latest, lots of canvas changes, still lots of canvas left to upgrade