modularized commands as originally intended