Final draft commit