Now I believe I have added all of the changes