consolidating some of the Atomic changes