made a lot of changes