CONTRIB: Improve the function of output