new contributions from Jonathan