rechecked some changes made