Some minor changes in working solution.