slightly smarter plan (and associated) data treatment