some changes have been made