[Beg-bogas] [BOGAS] #163: make EST stuff more efficient