incorporate some feedback from Adam O'Kane