Further tweaking of commando interface.