Impoved initial data, edit order init commit