Update code to manage the command problem