added name and id to output