more encounter restructuring