incorporate @alasdairhodge comments