diff --git a/apps/main/templates/dev_conf_edit.html b/apps/main/templates/dev_conf_edit.html
index 73cdc15..492a521 100644
--- a/apps/main/templates/dev_conf_edit.html
+++ b/apps/main/templates/dev_conf_edit.html
@@ -35,4 +35,75 @@
 
 {% endif %}
 
+{% if dds_device %}
+<script src="{% static 'js/dds_conversion.js' %}"></script>
+<script type="text/javascript">
+  
+    $("#id_clock").on('change', function() {
+    	updateFrequencies();
+    });
+    
+    $("#id_multiplier").on('change', function() {
+    	updateFrequencies();
+    });
+    
+    $("#id_frequencyA_Mhz").on('change', function() {
+    	updateBinaryFrequencies();
+    });
+    
+    $("#id_frequencyA").on('change', function() {
+    	updateFrequencies();
+    });
+    
+    $("#id_frequencyB_Mhz").on('change', function() {
+    	updateBinaryFrequencies();
+    });
+    
+    $("#id_frequencyB").on('change', function() {
+    	updateFrequencies();
+    });
+    
+    function updateBinaryFrequencies() {
+    	
+    	var clock = $("#id_clock").val();
+    	var multiplier = $("#id_multiplier").val();
+    	var freq = $("#id_frequencyA_Mhz").val();
+    	var freq_mod = $("#id_frequencyB_Mhz").val();
+    	
+    	var mclock = clock*multiplier;
+    	
+    	var freq_bin = freq2Binary(mclock, freq);
+    	var freq_mod_bin = freq2Binary(mclock, freq_mod);
+    	
+    	$("#id_frequencyA").val(freq_bin);
+    	$("#id_frequencyB").val(freq_mod_bin);
+    	
+    	freq = binary2Freq(mclock, freq_bin);
+    	freq_mod = binary2Freq(mclock, freq_mod_bin);
+    	
+    	$("#id_frequencyA_Mhz").val(freq);
+    	$("#id_frequencyB_Mhz").val(freq_mod);
+    	
+    }
+   
+    function updateFrequencies() {
+    	
+    	var clock = $("#id_clock").val();
+    	var multiplier = $("#id_multiplier").val();
+    	var freq_bin = $("#id_frequencyA").val();
+    	var freq_mod_bin = $("#id_frequencyB").val();
+    	
+    	var mclock = clock*multiplier;
+
+    	var freq = binary2Freq(mclock, freq_bin);
+    	var freq_mod = binary2Freq(mclock, freq_mod_bin);
+    	
+    	$("#id_frequencyA_Mhz").val(freq);
+    	$("#id_frequencyB_Mhz").val(freq_mod);
+    	
+    }
+    
+</script>
+{% endif %}
+
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/views.py b/apps/main/views.py
index 94296b6..668f40e 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -598,6 +598,11 @@ def dev_conf_new(request, id_exp=0, id_dev=0):
     kwargs['suptitle'] = 'New'
     kwargs['button'] = 'Create'
     
+    if id_dev != 0:
+        device = Device.objects.get(pk=id_dev)
+        if 'dds' in device.device_type.name:
+            kwargs['dds_device'] = True
+    
     return render(request, 'dev_conf_edit.html', kwargs)