Draft constitution "ready in two months", says advisor