Add better guides