Changed some germany-dependant formulations to international ones