stuff cleaned up so that dependency on store atomicity is removed