Included Bernd's contributions (section 8.4)