done, except for final doc