Added support for passing in your canvas