Adding two files missing in last merge and reverting some code to take c...

...are of code review

comments