Improved documentation and better preparation