Incorporate changes from Jon