soem changes
merged