WIP with domain update