Some changes to output