v2; major modifications; cf. diagram