local change
merged
slight corrections