#255 changes after review from Jon