3 extra en-sentences
no more usage of lazypromise
several intermediate changes