Added some design things
renamed