updated according to CM wiki