Added conditionals for detecting env, switches as well