Command improvment