Doc almost final