Output improved somewhat