Improved documentation for later