Add working solution.
more changes.