Incorporating feedback from Andreas and Thomas