some changes have been applied