applying feedback from Simon :-)