dh: update to structure based atomics