Made it more German friendly