change to call command first