Small changes... on the way to a working solution.