just some more polish for the solution II