another update, integrating feedback from Sebastian (tbc)