NOT WORKING some changes