Final (with Doc update)