Added (initial) final solution