UPDATED canvas routing & related stuff from lyra