Fixed minor changes in first draft from steffes, Need to rewrite 3.4 and 5