Updated base class draw function