revised files from Jon X
[ToDo] revisions