Minor changes for painting methods