Improve Priority painting for #213