Feature/upgrade descriptor

Disagree, all the other commands are wrong.