Moved from svg to canvas