All of my second set of changes