Newest Changes Done at 8:30

with some collaboration with Bob Droog we were able to solve all issues.