Merged....
Minor changes....