Commandset improved