diff --git a/tests/example.c b/tests/example.c
index fcccdc197..a04e5fdda 100644
--- a/tests/example.c
+++ b/tests/example.c
@@ -1,27 +1,55 @@
-/*  This is a minimal program calling Hamlib to get receive frequency.
+/*  This is a minimal program calling Hamlib to do some useful things.
  *  
  *  To compile:
  *  	gcc -L/usr/local/lib -lhamlib -o example example.c
  *  	if hamlib is installed in /usr/local/...
+ *  VARIATION: test smeter raw & calibrated
  */
 
 #include <stdio.h>
 #include <string.h>
 #include <hamlib/rig.h>
+#include <hamlib/riglist.h>
 
 int main() {
     RIG *my_rig;
-    char *rig_file;
+    char *rig_file, *info_buf;
     freq_t freq;
-    int status, retcode;
+	value_t rawstrength, power;
+	float s_meter, rig_raw2val();
+    int status, retcode, isz;
+    rmode_t mode;
+    pbwidth_t width;
 
-    rig_set_debug(RIG_DEBUG_ERR);   // signal errors only
-    my_rig = rig_init(1608);        // Ten-Tec Orion code
-    rig_file = "/dev/ham.orion";    // communications dev.
-	// you may prefer /dev/ttyS0
+/* Set verbosity level */
+    rig_set_debug(RIG_DEBUG_ERR);       // errors only
+/* Instantiate a rig */
+    my_rig = rig_init(RIG_MODEL_TT565); // Ten-Tec Orion code (1608)
+/* Set up serial port, baud rate */
+    rig_file = "/dev/ham.orion";        // you may prefer /dev/ttyS0
     strncpy(my_rig->state.rigport.pathname, rig_file, FILPATHLEN);
     my_rig->state.rigport.parm.serial.rate = 57600;
-    retcode = rig_open(my_rig);     // open the rig
-    status = rig_get_freq(my_rig, RIG_VFO_CURR, &freq); // get freq
-    printf("%f\n", freq);
+/* Open my rig */
+    retcode = rig_open(my_rig);
+/* Give me ID info, e.g., firmware version. */
+    info_buf = (char *)rig_get_info(my_rig);
+    printf("Rig_info: '%s'\n", info_buf);
+/* Main VFO frequency */
+    status = rig_get_freq(my_rig, RIG_VFO_CURR, &freq);
+    printf("VFO freq. = %.1f Hz\n", freq);
+/* Current mode */
+    status = rig_get_mode(my_rig, RIG_VFO_CURR, &mode, &width);
+    printf("Current mode = 0x%X, width = %d\n", mode, width);
+/* rig power output */
+    status = rig_get_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_RFPOWER, &power);
+    printf("RF Power setting = %.2f (0.0 - 1.0)\n", power.f);
+/* Raw and calibrated S-meter values */
+    /* Better: check to see if RIG_LEVEL_STRENGTH is supported
+       and if a calibration table is provided. */
+	status = rig_get_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_RAWSTR,
+		&rawstrength);
+	printf("Raw receive strength = %d\n", rawstrength);
+	isz = my_rig->caps->str_cal.size;
+	s_meter = rig_raw2val(rawstrength, &my_rig->caps->str_cal);
+	printf("S-meter value = %.2f dB relative to S9\n", s_meter);
 };