Added PaintCalculator