minor changes to make it work
another try to make it all work