Editing output methods. Only two diffs remain