Added full canvas functionality