Updated to a canvas tracker