Improving the Guide [ci skip]