applying comments from Brian on Oct 31
merged