more modular

%NAM%