some changes included