changed CommandHandler