intermediate changes to canvas
Merge conflicts