diff --git a/src/engine/engine.h b/src/engine/engine.h
index 4ce839c0b..8b8100500 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -52,9 +52,9 @@ class DivWorkPool;
 #define EXTERN_BUSY_BEGIN_SOFT e->softLocked=true; e->isBusy.lock();
 #define EXTERN_BUSY_END e->isBusy.unlock(); e->softLocked=false;
 
-//#define DIV_UNSTABLE
+#define DIV_UNSTABLE
 
-#define DIV_VERSION "0.6.1"
+#define DIV_VERSION "dev192 new osc"
 #define DIV_ENGINE_VERSION 192
 // for imports
 #define DIV_VERSION_MOD 0xff01
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index ef8276934..afbcf22d6 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -4673,6 +4673,20 @@ bool FurnaceGUI::loop() {
       MEASURE(effectList,drawEffectList());
     }
 
+    // after done, remove
+    if (ImGui::Begin("NewCode",NULL,ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_AlwaysAutoResize)) {
+      if (rend->supportsDrawOsc()) {
+        pushToggleColors(newOscCode);
+        if (ImGui::Button("New Code")) newOscCode=!newOscCode;
+        popToggleColors();
+      } else if (renderBackend==GUI_BACKEND_GL) {
+        ImGui::Text("Master, are you playing a trick on me?\nThat's not very nice!");
+      } else {
+        ImGui::Text("That would seem unwise given the\ncurrently selected Render Backend.");
+      }
+    }
+    ImGui::End();
+
     // release selection if mouse released
     if (ImGui::IsMouseReleased(ImGuiMouseButton_Left) && selecting) {
       if (!selectingFull) cursor=selEnd;
@@ -7296,6 +7310,7 @@ FurnaceGUI::FurnaceGUI():
   safeMode(false),
   midiWakeUp(true),
   makeDrumkitMode(false),
+  newOscCode(true),
   audioEngineChanged(false),
   settingsChanged(false),
   debugFFT(false),
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 17b2726c9..bfe976523 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -1507,6 +1507,7 @@ class FurnaceGUI {
   bool safeMode;
   bool midiWakeUp;
   bool makeDrumkitMode;
+  bool newOscCode;
   bool audioEngineChanged, settingsChanged, debugFFT;
   bool willExport[DIV_MAX_CHIPS];
   int vgmExportVersion;
diff --git a/src/gui/osc.cpp b/src/gui/osc.cpp
index 7c1045cf2..178b3b4e0 100644
--- a/src/gui/osc.cpp
+++ b/src/gui/osc.cpp
@@ -141,7 +141,7 @@ void FurnaceGUI::readOsc() {
 
 PendingDrawOsc _do;
 
-void _drawOsc(const ImDrawList* drawList, const ImDrawCmd* cmd) {
+static void _drawOsc(const ImDrawList* drawList, const ImDrawCmd* cmd) {
   if (cmd!=NULL) {
     if (cmd->UserCallbackData!=NULL) {
       ((FurnaceGUI*)(((PendingDrawOsc*)cmd->UserCallbackData)->gui))->runPendingDrawOsc((PendingDrawOsc*)cmd->UserCallbackData);
@@ -293,7 +293,7 @@ void FurnaceGUI::drawOsc() {
 
       if ((oscWidth-24)>0) {
         if (settings.oscMono) {
-          if (rend->supportsDrawOsc()) {
+          if (rend->supportsDrawOsc() && newOscCode) {
             _do.gui=this;
             _do.data=&oscValuesAverage[12];
             _do.len=oscWidth-24;
diff --git a/src/gui/render/renderGL.cpp b/src/gui/render/renderGL.cpp
index 31a5eaadb..1d0b5a4cd 100644
--- a/src/gui/render/renderGL.cpp
+++ b/src/gui/render/renderGL.cpp
@@ -103,7 +103,8 @@ const char* sh_oscRender_srcF=
   "varying vec2 fur_fragCoord;\n"
   "void main() {\n"
   "  vec2 uv = fur_fragCoord/uResolution;\n"
-  "  vec2 tresh = vec2(uLineWidth)/uResolution;\n"
+  "  uv.y *= 2.0;\n"
+  "  vec2 tresh = vec2(1.0,1.0)/uResolution;\n"
   "  float x1 = uv.x-uAdvance;\n"
   "  float x2 = uv.x;\n"
   "  float x3 = uv.x+uAdvance;\n"
@@ -113,12 +114,8 @@ const char* sh_oscRender_srcF=
   "  float valmax = max(max(val1,val2),val3);\n"
   "  float valmin = min(min(val1,val2),val3);\n"
   "  float vald = abs(valmax-valmin);\n"
-  "  float alpha = 1.0-abs(uv.y-val2)/max(tresh.y,vald);\n"
-  "  if (vald>(1.0/uResolution.y)) {\n"
-  "    gl_FragColor = vec4(1.0,0.0,0.0,uColor.w*alpha);\n"
-  "  } else {\n"
-  "    gl_FragColor = vec4(uColor.xyz,uColor.w*alpha);\n"
-  "  }\n"
+  "  float alpha = (uLineWidth*0.75)-abs(uv.y-val2)/max(tresh.y,vald);\n"
+  "  gl_FragColor = vec4(uColor.xyz,uColor.w*clamp(alpha,0.0,1.0));\n"
   "}\n";
 #else
 const char* sh_wipe_srcV=
@@ -381,10 +378,17 @@ void FurnaceGUIRenderGL::drawOsc(float* data, size_t len, ImVec2 pos0, ImVec2 po
   if (!furUniform1f) return;
   if (!furUniform2f) return;
   if (!furUniform1i) return;
+  if (len<0) return;
 
-  if (len>2048) len=2048;
+  if (len>2048) {
+    logW("len is %d!",len);
+    len=2048;
+  }
 
   memcpy(oscData,data,len*sizeof(float));
+  if (len<2048) {
+    oscData[len]=oscData[len-1];
+  }
 
   int lastArrayBuf=0;
   int lastElemArrayBuf=0;
@@ -422,19 +426,19 @@ void FurnaceGUIRenderGL::drawOsc(float* data, size_t len, ImVec2 pos0, ImVec2 po
   oscVertex[0][0]=pos0.x;
   oscVertex[0][1]=pos1.y;
   oscVertex[0][2]=0.0f;
-  oscVertex[0][3]=height;
+  oscVertex[0][3]=-height;
   oscVertex[1][0]=pos1.x;
   oscVertex[1][1]=pos1.y;
   oscVertex[1][2]=(float)len;
-  oscVertex[1][3]=height;
+  oscVertex[1][3]=-height;
   oscVertex[2][0]=pos0.x;
   oscVertex[2][1]=pos0.y;
   oscVertex[2][2]=0.0f;
-  oscVertex[2][3]=-height;
+  oscVertex[2][3]=height;
   oscVertex[3][0]=pos1.x;
   oscVertex[3][1]=pos0.y;
   oscVertex[3][2]=(float)len;
-  oscVertex[3][3]=-height;
+  oscVertex[3][3]=height;
 
   C(glGetIntegerv(GL_ARRAY_BUFFER_BINDING,&lastArrayBuf));
   C(glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING,&lastElemArrayBuf));
@@ -453,7 +457,7 @@ void FurnaceGUIRenderGL::drawOsc(float* data, size_t len, ImVec2 pos0, ImVec2 po
   C(furUniform4fv(sh_oscRender_uColor,1,(float*)&color));
   C(furUniform1f(sh_oscRender_uLineWidth,lineWidth));
   C(furUniform1f(sh_oscRender_uAdvance,(1.0f/2048.0f)*((float)len/width)));
-  C(furUniform2f(sh_oscRender_uResolution,2048.0f,height));
+  C(furUniform2f(sh_oscRender_uResolution,2048.0f,2.0f*height));
   C(furUniform1i(sh_oscRender_oscVal,0));
 
   C(glDrawArrays(GL_TRIANGLE_STRIP,0,4));
@@ -484,7 +488,7 @@ bool FurnaceGUIRenderGL::getOutputSize(int& w, int& h) {
 }
 
 bool FurnaceGUIRenderGL::supportsDrawOsc() {
-  return true;
+  return sh_oscRender_have;
 }
 
 int FurnaceGUIRenderGL::getWindowFlags() {
@@ -585,11 +589,11 @@ bool FurnaceGUIRenderGL::init(SDL_Window* win) {
   C(furActiveTexture(GL_TEXTURE0));
 
   // create shaders
-  if (createShader(sh_wipe_srcV,sh_wipe_srcF,sh_wipe_vertex,sh_wipe_fragment,sh_wipe_program,sh_wipe_attrib)) {
+  if ((sh_wipe_have=createShader(sh_wipe_srcV,sh_wipe_srcF,sh_wipe_vertex,sh_wipe_fragment,sh_wipe_program,sh_wipe_attrib))==true) {
     sh_wipe_uAlpha=furGetUniformLocation(sh_wipe_program,"uAlpha");
   }
 
-  if (createShader(sh_oscRender_srcV,sh_oscRender_srcF,sh_oscRender_vertex,sh_oscRender_fragment,sh_oscRender_program,sh_oscRender_attrib)) {
+  if ((sh_oscRender_have=createShader(sh_oscRender_srcV,sh_oscRender_srcF,sh_oscRender_vertex,sh_oscRender_fragment,sh_oscRender_program,sh_oscRender_attrib))==true) {
     sh_oscRender_uColor=furGetUniformLocation(sh_oscRender_program,"uColor");
     sh_oscRender_uAdvance=furGetUniformLocation(sh_oscRender_program,"uAdvance");
     sh_oscRender_uLineWidth=furGetUniformLocation(sh_oscRender_program,"uLineWidth");
diff --git a/src/gui/render/renderGL.h b/src/gui/render/renderGL.h
index 0b7e79f82..28dee4623 100644
--- a/src/gui/render/renderGL.h
+++ b/src/gui/render/renderGL.h
@@ -35,6 +35,7 @@ class FurnaceGUIRenderGL: public FurnaceGUIRender {
   int sh_wipe_fragment;
   int sh_wipe_program;
   int sh_wipe_uAlpha;
+  bool sh_wipe_have;
   // -> oscRender
   int sh_oscRender_vertex;
   int sh_oscRender_fragment;
@@ -44,6 +45,7 @@ class FurnaceGUIRenderGL: public FurnaceGUIRender {
   int sh_oscRender_uAdvance;
   int sh_oscRender_uResolution;
   int sh_oscRender_oscVal;
+  bool sh_oscRender_have;
 
   bool createShader(const char* vertexS, const char* fragmentS, int& vertex, int& fragment, int& program, const char** attribNames);