Added canvas view controller
removed userstate