atom updates
merged