Done with the initial draft