Changes to painting
Merged painting file