Added conditions to check for in the shell