Working copy before implementing changes of KC, Michael, Update July 8th.
first commit of new changes