Changes to parameter passing for canvas drawing