better Or implied-atomic? & unit tests