Made some changes to output