improves handling of painting dataset