Incorporate Fisher's comments on 2014/10/18