Add First step of cmd1
bug fixes