Some more love to doc draft Analyy...