some changes ...