Correct subcommand routine