several changes
merged