k054338: updated to use inline configs. nw.
k053936: updated to use inline configs. nw.