I have made some changes