Complete remake in canvas