Update per Stephen Fluins layout idea
non-conflict?