master #2 further adjustments