Updated Commands, remove impossible cases