CommandMode Reworking