Improved design and added points from doc