Some modifications to output