20140417 Modification according to S. Linn request