revisited 17.06

lots of changes