Changed the design of some things