Added design and new structure