Second draft, full version