Improved design and some other stuff