reverting most changes