Merge in new, simpler print logic