Improved design a little