Use subset2 thorough. Closes #337
Reduce code output