Working commit of CMD criteria