More elegant way to solve
Task added
Canvas added