diff --git a/plutosdr_source/CMakeLists.txt b/plutosdr_source/CMakeLists.txt
index 760d099..291f7d7 100644
--- a/plutosdr_source/CMakeLists.txt
+++ b/plutosdr_source/CMakeLists.txt
@@ -25,9 +25,14 @@ if (MSVC)
 else (MSVC)
     find_package(PkgConfig)
 
-    pkg_check_modules(SOAPY REQUIRED iio)
+    pkg_check_modules(SOAPY REQUIRED libiio)
+    pkg_check_modules(SOAPY REQUIRED libad9361)
 
-    target_include_directories(plutosdr_source PUBLIC ${IIO_INCLUDE_DIRS})
-    target_link_directories(plutosdr_source PUBLIC ${IIO_LIBRARY_DIRS})
-    target_link_libraries(plutosdr_source PUBLIC ${IIO_LIBRARIES})
+    target_include_directories(plutosdr_source PUBLIC ${LIBIIO_INCLUDE_DIRS})
+    target_link_directories(plutosdr_source PUBLIC ${LIBIIO_LIBRARY_DIRS})
+    target_link_libraries(plutosdr_source PUBLIC ${LIBIIO_LIBRARIES})
+
+    target_include_directories(plutosdr_source PUBLIC ${LIBAD9361_INCLUDE_DIRS})
+    target_link_directories(plutosdr_source PUBLIC ${LIBAD9361_LIBRARY_DIRS})
+    target_link_libraries(plutosdr_source PUBLIC ${LIBAD9361_LIBRARIES})
 endif (MSVC)
\ No newline at end of file
diff --git a/recorder/src/main.cpp b/recorder/src/main.cpp
index 2a5c6cd..2d7cc1b 100644
--- a/recorder/src/main.cpp
+++ b/recorder/src/main.cpp
@@ -79,8 +79,8 @@ private:
         ImGui::BeginGroup();
 
         // TODO: Change VFO ref in signal path
-
-        ImGui::Columns(3, CONCAT("RecordModeColumns##_", _this->name), false);
+        // TODO: Add VFO record
+        ImGui::Columns(2, CONCAT("RecordModeColumns##_", _this->name), false);
         if (ImGui::RadioButton(CONCAT("Baseband##_", _this->name), _this->recMode == 0) && _this->recMode != 0) { 
             _this->recMode = 0;
         }
@@ -88,10 +88,6 @@ private:
         if (ImGui::RadioButton(CONCAT("Audio##_", _this->name), _this->recMode == 1) && _this->recMode != 1) {
             _this->recMode = 1;
         }
-        ImGui::NextColumn();
-        if (ImGui::RadioButton(CONCAT("VFO##_", _this->name), _this->recMode == 2) && _this->recMode != 2) {
-            _this->recMode = 2;
-        }
         ImGui::Columns(1, CONCAT("EndRecordModeColumns##_", _this->name), false);
 
         ImGui::EndGroup();
@@ -209,6 +205,7 @@ private:
     dsp::stream<dsp::stereo_t>* audioStream;
     dsp::stream<dsp::complex_t>* iqStream;
     WavWriter* writer;
+    VFOManager::VFO* vfo;
     std::thread workerThread;
     bool recording;
     time_t startTime;
@@ -217,6 +214,7 @@ private:
     int selectedStreamId;
     uint64_t samplesWritten;
     float sampleRate;
+    float vfoSampleRate = 200000;
     int recMode = 0;
 
 };