Command improvement