minor modifications on paper
merged