some changes and many figures