Made some changes for output