added shell conditions