Some changes to format