updated for v6.0 canvas system