some changes OK