Changed a lot of the design