Modifying the documentation and the design