More changes to painter