NP-3178: more playing around