changes for new Canvas setup