took Wouter's suggestions of the 2nd review into consideration