Updates to atom
Merging in upstream changes