MADE MORE CHANGES