diff --git a/core/tasks.py b/core/tasks.py
index 7ecc8bd..decc041 100755
--- a/core/tasks.py
+++ b/core/tasks.py
@@ -6,17 +6,17 @@ from dss import settings
 from spa.signals import waveform_generated
 
 @task(time_limit=3600)
-def create_waveform_task(in_file, mix_uid):
-    out_file = os.path.join(settings.MEDIA_ROOT, 'waveforms/%s.png' % mix_uid)
+def create_waveform_task(in_file, uid):
+    out_file = os.path.join(settings.MEDIA_ROOT, 'waveforms/%s.png' % uid)
     print "Creating waveform \n\tIn: %s\n\tOut: %s" % (in_file, out_file)
     generate_waveform(in_file, out_file)
     if os.path.isfile(out_file):
         print "Waveform generated successfully"
         file, extension = os.path.splitext(in_file)
-        new_file = os.path.join(settings.MEDIA_ROOT, "mixes", file)
+        new_file = os.path.join(settings.MEDIA_ROOT, "mixes", "%s%s" % (uid, extension))
         print "Moving cache audio clip from %s to %s" % (in_file, new_file)
         shutil.move(in_file, new_file)
-        print "Uid: %s" % mix_uid
-        waveform_generated.send(sender=None, uid=mix_uid)
+        print "Uid: %s" % uid
+        waveform_generated.send(sender=None, uid=uid)
     else:
         print "Outfile is missing"
diff --git a/spa/ajax.py b/spa/ajax.py
index 38d5340..900a4f6 100755
--- a/spa/ajax.py
+++ b/spa/ajax.py
@@ -251,7 +251,6 @@ def upload(request):
             pass
 
         create_waveform_task.delay(in_file=os.path.join(file_storage.base_location, cache_file), mix_uid=uid)
-        #create_waveform_task(in_file=cache_file, mix_uid=uid)
 
         file_dict = {
             'size': in_file.size,