make so many small changes