replace remaining _draw methods with public draw