Switched canvas, added comments