show and watch commands modified