Yes - both your current billing format and your option to choose between consolidated and individual invoicing stay exactly as they are.