Changed command logic