modifications according to current pull-request discutions