fixing up for canvas