Merged changes on laptop

fixed erroneous merge before
Updated shell evaluation.