Added MAX_COMMAND_COUNT