first improvement from geekdoc version