diff --git a/src/formats.c b/src/formats.c
index c71dc582..7f2ead2d 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -909,7 +909,7 @@ static const meta_info meta_info_list[] = {
         {meta_X360_TRA,             "Terminal Reality .TRA raw header"},
         {meta_PS2_VGS,              "Princess Soft VGS header"},
         {meta_PS2_IAB,              "Runtime .IAB header"},
-        {meta_PS2_STRLR,            "STR L/R header"},
+        {meta_PS2_STRLR,            "The Bouncer STR header"},
         {meta_LSF_N1NJ4N,           ".lsf !n1nj4n header"},
         {meta_VAWX,                 "feelplus VAWX header"},
         {meta_PC_SNDS,              "assumed Heavy Iron IMA by .snds extension"},
diff --git a/src/layout/blocked_ps2_strlr.c b/src/layout/blocked_ps2_strlr.c
index d2834db5..17f982bb 100644
--- a/src/layout/blocked_ps2_strlr.c
+++ b/src/layout/blocked_ps2_strlr.c
@@ -1,19 +1,17 @@
 #include "layout.h"
 #include "../vgmstream.h"
 
-/* set up for the block at the given offset */
+/* The Bouncer STRx blocks, one block per channel when stereo */
 void block_update_ps2_strlr(off_t block_offset, VGMSTREAM * vgmstream) {
+    STREAMFILE* streamFile = vgmstream->ch[0].streamfile;
     int i;
 
-	vgmstream->current_block_offset = block_offset;
-	vgmstream->current_block_size = read_32bitLE(
-			vgmstream->current_block_offset+0x4,
-			vgmstream->ch[0].streamfile)*2;
-	vgmstream->next_block_offset = vgmstream->current_block_offset+vgmstream->current_block_size+0x40;
-	//vgmstream->current_block_size/=vgmstream->channels;
+    vgmstream->current_block_offset = block_offset;
+    vgmstream->current_block_size = read_32bitLE(block_offset+0x04,streamFile); /* can be smaller than 0x800 */
+    vgmstream->next_block_offset = block_offset + 0x800*vgmstream->channels;
+    /* 0x08: number of remaning blocks, 0x10: some id/size? (shared in all blocks) */
 
-	for (i=0;i<vgmstream->channels;i++) {
-        vgmstream->ch[i].offset = vgmstream->current_block_offset+0x20+(0x800*i);
-		
+    for (i = 0; i < vgmstream->channels; i++) {
+        vgmstream->ch[i].offset = block_offset + 0x20 + 0x800*i;
     }
 }
diff --git a/src/meta/ps2_strlr.c b/src/meta/ps2_strlr.c
index 2003f379..9e8a42c6 100644
--- a/src/meta/ps2_strlr.c
+++ b/src/meta/ps2_strlr.c
@@ -1,80 +1,57 @@
 #include "meta.h"
 #include "../layout/layout.h"
-#include "../util.h"
+#include "../coding/coding.h"
 
-/* STR: The Bouncer (PS2) */
+/* STR - The Bouncer (PS2) */
 VGMSTREAM * init_vgmstream_ps2_strlr(STREAMFILE *streamFile) {
     VGMSTREAM * vgmstream = NULL;
-    char filename[PATH_LIMIT];
-    int loop_flag = 0;
-	int channel_count;
-    int i;
-	off_t start_offset;
-	
-    /* check extension, case insensitive */
-    streamFile->get_name(streamFile,filename,sizeof(filename));
-    if (strcasecmp("str",filename_extension(filename))) goto fail;
+    int channel_count, loop_flag;
+    off_t start_offset;
+
+
+    /* checks */
+    /* .vs: real extension (from .nam container) , .str: partial header id */
+    if (!check_extensions(streamFile, "vs,str"))
+        goto fail;
 
-#if 0
     /* check header */
-    if (read_32bitBE(0x00,streamFile) != 0x5354524C) /* "STRL" */
+    if (!(read_32bitBE(0x000,streamFile) == 0x5354524C &&   /* "STRL" */
+          read_32bitBE(0x800,streamFile) == 0x53545252) &&  /* "STRR" */
+        read_32bitBE(0x00,streamFile) != 0x5354524D)        /* "STRM" */
         goto fail;
-	if (read_32bitBE(0x00,streamFile) != 0x53545252) /* "STRR" */
-        goto fail;
-#endif
 
-    /* don't hijack Sonic & Sega All Stars Racing X360 (xma) */
-    if (read_32bitBE(0x00,streamFile) == 0x52494646)
-        goto fail; /* "RIFF"*/
-    /* don't hijack Mad Dash Racing (Xbox) */
-    if (read_32bitLE(0x0c,streamFile) == 1
-            && read_32bitLE(0x010,streamFile) == 0
-            && read_32bitLE(0x400,streamFile) == 0
-            && read_32bitLE(0x7f0,streamFile) == 0)
-        goto fail;
 
     loop_flag = 0;
-    channel_count = 2;
-    
-	/* build the VGMSTREAM */
+    channel_count = (read_32bitBE(0x00,streamFile) == 0x5354524D) ? 1 : 2; /* "STRM"=mono (voices) */
+    start_offset = 0x00;
+
+    /* build the VGMSTREAM */
     vgmstream = allocate_vgmstream(channel_count,loop_flag);
     if (!vgmstream) goto fail;
 
-	/* fill in the vital statistics */
-    start_offset = 0x0;
-	vgmstream->channels = channel_count;
-    vgmstream->sample_rate = 48000;
+    vgmstream->sample_rate = 44100;
     vgmstream->coding_type = coding_PSX;
 
     vgmstream->layout_type = layout_blocked_ps2_strlr;
-    //vgmstream->interleave_block_size = read_32bitLE(0xC, streamFile);
     vgmstream->meta_type = meta_PS2_STRLR;
-    
-    /* open the file for reading by each channel */
+
+    if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
+        goto fail;
+
+    /* calc num_samples */
     {
-        for (i=0;i<channel_count;i++) 
-		{
-            vgmstream->ch[i].streamfile = streamFile->open(streamFile, filename, 0x8000);            
-			if (!vgmstream->ch[i].streamfile) goto fail;
+        vgmstream->next_block_offset = start_offset;
+        do {
+            block_update_ps2_strlr(vgmstream->next_block_offset,vgmstream);
+            vgmstream->num_samples += ps_bytes_to_samples(vgmstream->current_block_size, 1);
         }
+        while (vgmstream->next_block_offset < get_streamfile_size(streamFile));
     }
 
-    /* Calc num_samples */
     block_update_ps2_strlr(start_offset, vgmstream);
-    vgmstream->num_samples=0;
-
-    do
-	{
-		vgmstream->num_samples += vgmstream->current_block_size * 14 / 16;
-        block_update_ps2_strlr(vgmstream->next_block_offset, vgmstream);
-    } while (vgmstream->next_block_offset < get_streamfile_size(streamFile));
-
-    block_update_ps2_strlr(start_offset, vgmstream);
-
     return vgmstream;
 
-    /* clean up anything we may have opened */
 fail:
-    if (vgmstream) close_vgmstream(vgmstream);
+    close_vgmstream(vgmstream);
     return NULL;
 }