fully working changes