issue #39, improving content