update to use Base.Graphics