Add Mon paint call and tweaks