Bunch of changes as a result of atom setup