Improved docu