Jon: deleted some comments