adding lots of changings, looks a lot better