final 2.0 draft done