Added the rest of the changes :/