some changes to the output, but many more needed