canvas changes
merge