completed the rest of the changes