diff --git a/src/rds.c b/src/rds.c
index 7fec633..3990aad 100644
--- a/src/rds.c
+++ b/src/rds.c
@@ -429,7 +429,9 @@ void init_rds_encoder(struct rds_params_t rds_params) {
 	set_rds_ct(1);
 	set_rds_ms(1);
 	set_rds_di(DI_STEREO | DI_DPTY);
-	set_rds_grpseq((unsigned char*)"00012222FFR");
+	set_rds_grpseq(rds_params.grp_sqc);
+	set_rds_udg1(rds_params.udg1);
+	set_rds_udg1(rds_params.udg2);
 
 	init_rtplus(GROUP_11A);
 
diff --git a/src/rds95.c b/src/rds95.c
index 9f0020a..33dc18e 100644
--- a/src/rds95.c
+++ b/src/rds95.c
@@ -67,7 +67,8 @@ int main(int argc, char **argv) {
 		.rt1 = "",
 		.pi = 0x305F,
 		.ecc = 0xE2,
-		.lps = "radio95 - Radio Nowotomyskie"
+		.lps = "radio95 - Radio Nowotomyskie",
+		.grp_sqc = "00012222FFR"
 	};
 	/* PASIMPLE */
 	pa_simple *device;
@@ -184,11 +185,9 @@ int main(int argc, char **argv) {
 		goto exit;
 	}
 
-	/* Initialize the control pipe reader */
 	if (control_pipe[0]) {
 		if (open_control_pipe(control_pipe) == 0) {
 			fprintf(stderr, "Reading control commands on %s.\n", control_pipe);
-			/* Create control pipe polling worker */
 			int r;
 			r = pthread_create(&control_pipe_thread, &attr, control_pipe_worker, NULL);
 			if (r < 0) {
@@ -221,7 +220,6 @@ int main(int argc, char **argv) {
 
 exit:
 	if (control_pipe[0]) {
-		/* shut down threads */
 		fprintf(stderr, "Waiting for pipe thread to shut down.\n");
 		pthread_join(control_pipe_thread, NULL);
 	}