changed back some of the changes