feedback from Brian Smith and Stephen Farrell