AL:included all comments. Figures still need update