rejig and format