corrections 1
merged