added command-id feature