adapt solution to 13 to Kleemanns demands