Outputs improvement