shell

some conditional changes