changed arhictecture