new file
simplifications and comments added
new files added