diff --git a/examples/test.c b/examples/test.c
index 9350695..fa34ece 100644
--- a/examples/test.c
+++ b/examples/test.c
@@ -16,6 +16,15 @@ static int answer_phone_version_message(skipstone_message_service *service,
         1, 0xff, 0xff, 0xff, 0xff, 0x80, 0, 0, 0, 0, 0, 0, 0x32
     };
 
+    printf("Got message on endpoint %hu\n", id);
+
+    skipstone_message_service_queue(service, &response, sizeof(response), id);
+
+    return 0;
+}
+
+static int answer_media_message(skipstone_message_service *service,
+        void *buf, uint16_t size, uint16_t id) {
     struct {
         uint8_t command;
         uint8_t artist_len;
@@ -33,8 +42,7 @@ static int answer_phone_version_message(skipstone_message_service *service,
 
     printf("Got message on endpoint %hu\n", id);
 
-    skipstone_message_service_queue(service, &play_track, sizeof(play_track), 20);
-    skipstone_message_service_queue(service, &response, sizeof(response), id);
+    skipstone_message_service_queue(service, &play_track, sizeof(play_track), 32);
 
     return 0;
 }
@@ -79,6 +87,7 @@ int main(int argc, char **argv) {
     }
 
     skipstone_message_service_register(service, 17, answer_phone_version_message, NULL);
+    skipstone_message_service_register(service, 32, answer_media_message,         NULL);
 
     skipstone_message_service_run(service, link);
 
diff --git a/examples/test.c-e b/examples/test.c-e
index 9350695..fa34ece 100644
--- a/examples/test.c-e
+++ b/examples/test.c-e
@@ -16,6 +16,15 @@ static int answer_phone_version_message(skipstone_message_service *service,
         1, 0xff, 0xff, 0xff, 0xff, 0x80, 0, 0, 0, 0, 0, 0, 0x32
     };
 
+    printf("Got message on endpoint %hu\n", id);
+
+    skipstone_message_service_queue(service, &response, sizeof(response), id);
+
+    return 0;
+}
+
+static int answer_media_message(skipstone_message_service *service,
+        void *buf, uint16_t size, uint16_t id) {
     struct {
         uint8_t command;
         uint8_t artist_len;
@@ -33,8 +42,7 @@ static int answer_phone_version_message(skipstone_message_service *service,
 
     printf("Got message on endpoint %hu\n", id);
 
-    skipstone_message_service_queue(service, &play_track, sizeof(play_track), 20);
-    skipstone_message_service_queue(service, &response, sizeof(response), id);
+    skipstone_message_service_queue(service, &play_track, sizeof(play_track), 32);
 
     return 0;
 }
@@ -79,6 +87,7 @@ int main(int argc, char **argv) {
     }
 
     skipstone_message_service_register(service, 17, answer_phone_version_message, NULL);
+    skipstone_message_service_register(service, 32, answer_media_message,         NULL);
 
     skipstone_message_service_run(service, link);