New design and some more details