Adding all the changes