diff --git a/app/build.gradle b/app/build.gradle
index 0712dd50e..f529cef7a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@ android {
 
     defaultConfig {
         applicationId "nl.tudelft.trustchain"
-        minSdkVersion 24
+        minSdkVersion 22
         targetSdkVersion 29
         versionCode generateVersionCode()
         versionName "0.1"
@@ -117,8 +117,8 @@ dependencies {
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     // Logging
@@ -135,6 +135,7 @@ dependencies {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions.freeCompilerArgs += [
-        "-Xuse-experimental=kotlin.Experimental,kotlin.ExperimentalUnsignedTypes"
+        "-Xuse-experimental=kotlin.Experimental,kotlin.ExperimentalUnsignedTypes",
+        "-Xopt-in=kotlin.RequiresOptIn"
     ]
 }
diff --git a/app/src/main/java/nl/tudelft/trustchain/app/TrustChainApplication.kt b/app/src/main/java/nl/tudelft/trustchain/app/TrustChainApplication.kt
index a3876a202..f0fc90fd0 100644
--- a/app/src/main/java/nl/tudelft/trustchain/app/TrustChainApplication.kt
+++ b/app/src/main/java/nl/tudelft/trustchain/app/TrustChainApplication.kt
@@ -2,6 +2,7 @@ package nl.tudelft.trustchain.app
 
 import android.app.Application
 import android.bluetooth.BluetoothManager
+import android.os.Build
 import android.util.Log
 import androidx.core.content.getSystemService
 import androidx.preference.PreferenceManager
@@ -111,8 +112,8 @@ class TrustChainApplication : Application() {
         val strategies = mutableListOf(
             randomWalk, randomChurn, periodicSimilarity, nsd
         )
-        if (bluetoothManager.adapter != null) {
-            val ble = BluetoothLeDiscovery.Factory(this, bluetoothManager)
+        if (bluetoothManager.adapter != null && Build.VERSION.SDK_INT >= 24) {
+            val ble = BluetoothLeDiscovery.Factory()
             strategies += ble
         }
 
diff --git a/app/src/main/java/nl/tudelft/trustchain/app/ui/dashboard/DashboardItemRenderer.kt b/app/src/main/java/nl/tudelft/trustchain/app/ui/dashboard/DashboardItemRenderer.kt
index 6916a03a3..96caeedb1 100644
--- a/app/src/main/java/nl/tudelft/trustchain/app/ui/dashboard/DashboardItemRenderer.kt
+++ b/app/src/main/java/nl/tudelft/trustchain/app/ui/dashboard/DashboardItemRenderer.kt
@@ -1,6 +1,7 @@
 package nl.tudelft.trustchain.app.ui.dashboard
 
 import android.content.res.ColorStateList
+import androidx.core.content.res.ResourcesCompat
 import com.mattskala.itemadapter.BindingItemRenderer
 import nl.tudelft.trustchain.app.databinding.ItemDashboardBinding
 
@@ -12,7 +13,7 @@ class DashboardItemRenderer(
 ) {
     override fun bindView(item: DashboardItem, binding: ItemDashboardBinding) {
         val context = binding.root.context
-        val color = context.getColor(item.app.color)
+        val color = ResourcesCompat.getColor(context.resources, item.app.color, null)
         binding.imgIcon.setImageResource(item.app.icon)
         binding.imgIcon.imageTintList = ColorStateList.valueOf(color)
         binding.txtAppName.text = item.app.appName
diff --git a/build.gradle b/build.gradle
index 69511f797..53912852e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@
 buildscript {
     ext.kotlin_version = '1.3.72'
     ext.ktlint_version = '0.36.0'
+    ext.coroutines_version = '1.3.7'
     ext.ktlint_gradle_version = '9.1.1'
     ext.sqldelight_version = '1.2.2'
     ext.nav_version = "2.2.1"
diff --git a/common/build.gradle b/common/build.gradle
index 6648075e6..4806919ae 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -15,7 +15,7 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 22
         targetSdkVersion 29
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -91,3 +91,10 @@ dependencies {
     testImplementation "com.squareup.sqldelight:sqlite-driver:$sqldelight_version"
     testImplementation "com.goterl.lazycode:lazysodium-java:4.2.4"
 }
+
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions.freeCompilerArgs += [
+        "-Xopt-in=kotlin.RequiresOptIn"
+    ]
+}
diff --git a/common/src/main/java/nl/tudelft/trustchain/common/DemoCommunity.kt b/common/src/main/java/nl/tudelft/trustchain/common/DemoCommunity.kt
index f44ee4e33..d8e46784c 100644
--- a/common/src/main/java/nl/tudelft/trustchain/common/DemoCommunity.kt
+++ b/common/src/main/java/nl/tudelft/trustchain/common/DemoCommunity.kt
@@ -1,6 +1,8 @@
 package nl.tudelft.trustchain.common
 
 import android.util.Log
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.BroadcastChannel
 import nl.tudelft.ipv8.IPv4Address
 import nl.tudelft.ipv8.Community
 import nl.tudelft.ipv8.Peer
@@ -8,6 +10,7 @@ import nl.tudelft.ipv8.android.IPv8Android
 import nl.tudelft.ipv8.attestation.trustchain.TrustChainCommunity
 import nl.tudelft.ipv8.messaging.*
 import nl.tudelft.ipv8.messaging.payload.IntroductionResponsePayload
+import nl.tudelft.ipv8.messaging.payload.PuncturePayload
 import java.util.*
 
 class DemoCommunity : Community() {
@@ -17,6 +20,9 @@ class DemoCommunity : Community() {
 
     val lastTrackerResponses = mutableMapOf<IPv4Address, Date>()
 
+    @ExperimentalCoroutinesApi
+    val punctureChannel = BroadcastChannel<Pair<Address, PuncturePayload>>(10000)
+
     // Retrieve the trustchain community
     private fun getTrustChainCommunity(): TrustChainCommunity {
         return IPv8Android.getInstance().getOverlay()
@@ -46,6 +52,7 @@ class DemoCommunity : Community() {
     object MessageId {
         const val THALIS_MESSAGE = 222
         const val TORRENT_MESSAGE = 223
+        const val PUNCTURE_TEST = 251
     }
 
     // SEND MESSAGE
@@ -69,10 +76,17 @@ class DemoCommunity : Community() {
         }
     }
 
+    fun sendPuncture(address: IPv4Address, id: Int) {
+        val payload = PuncturePayload(myEstimatedLan, myEstimatedWan, id)
+        val packet = serializePacket(MessageId.PUNCTURE_TEST, payload, sign = false)
+        endpoint.send(address, packet)
+    }
+
     // RECEIVE MESSAGE
     init {
         messageHandlers[MessageId.THALIS_MESSAGE] = ::onMessage
         messageHandlers[MessageId.TORRENT_MESSAGE] = ::onTorrentMessage
+        messageHandlers[MessageId.PUNCTURE_TEST] = ::onPunctureTest
     }
 
     private fun onMessage(packet: Packet) {
@@ -85,6 +99,12 @@ class DemoCommunity : Community() {
         val (peer, payload) = packet.getAuthPayload(MyMessage.Deserializer)
         Log.i("personal", peer.mid + ": " + payload.message)
     }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private fun onPunctureTest(packet: Packet) {
+        val payload = packet.getPayload(PuncturePayload.Deserializer)
+        punctureChannel.offer(Pair(packet.source, payload))
+    }
 }
 
 // THE MESSAGE (CLASS)
diff --git a/common/src/main/java/nl/tudelft/trustchain/common/MarketCommunity.kt b/common/src/main/java/nl/tudelft/trustchain/common/MarketCommunity.kt
index feeea7089..dd0a71681 100644
--- a/common/src/main/java/nl/tudelft/trustchain/common/MarketCommunity.kt
+++ b/common/src/main/java/nl/tudelft/trustchain/common/MarketCommunity.kt
@@ -1,3 +1,4 @@
+
 package nl.tudelft.trustchain.common
 
 import android.util.Log
@@ -47,7 +48,7 @@ class MarketCommunity : Community() {
     private fun onTradePacket(packet: Packet) {
         val payload = packet.getAuthPayload(TradePayload.Deserializer).second
         notifyListeners(payload)
-        Log.d("MarketCommunity::onTradePacket", "Received packet:{${payload.primaryCurrency}, ${payload.secondaryCurrency}, ${payload.amount}, ${payload.price}, ${payload.type}}")
+        Log.d("MarketCommunity", "Received packet:{${payload.primaryCurrency}, ${payload.secondaryCurrency}, ${payload.amount}, ${payload.price}, ${payload.type}}")
     }
 
     fun addListener(type: TradePayload.Type?, listener: (TradePayload) -> Unit) {
diff --git a/currencyii/build.gradle b/currencyii/build.gradle
index 0233d6e30..20fe15d91 100644
--- a/currencyii/build.gradle
+++ b/currencyii/build.gradle
@@ -16,7 +16,7 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 22
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/debug/build.gradle b/debug/build.gradle
index 1026170bf..121297c75 100644
--- a/debug/build.gradle
+++ b/debug/build.gradle
@@ -7,7 +7,7 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 22
         targetSdkVersion 29
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -57,8 +57,8 @@ dependencies {
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     // Logging
@@ -72,3 +72,9 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions.freeCompilerArgs += [
+        "-Xopt-in=kotlin.RequiresOptIn"
+    ]
+}
diff --git a/debug/src/main/java/nl/tudelft/trustchain/debug/DebugFragment.kt b/debug/src/main/java/nl/tudelft/trustchain/debug/DebugFragment.kt
index 21920397e..47e4c059e 100644
--- a/debug/src/main/java/nl/tudelft/trustchain/debug/DebugFragment.kt
+++ b/debug/src/main/java/nl/tudelft/trustchain/debug/DebugFragment.kt
@@ -7,25 +7,56 @@ import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Bundle
 import android.text.style.ForegroundColorSpan
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.text.bold
 import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
 import kotlinx.coroutines.*
 import nl.tudelft.ipv8.Community
+import nl.tudelft.ipv8.peerdiscovery.DiscoveryCommunity
 import nl.tudelft.ipv8.util.toHex
 import nl.tudelft.trustchain.common.ui.BaseFragment
 import nl.tudelft.trustchain.common.util.viewBinding
 import nl.tudelft.trustchain.debug.databinding.FragmentDebugBinding
+import java.text.SimpleDateFormat
 import java.util.*
 
 
 class DebugFragment : BaseFragment(R.layout.fragment_debug) {
     private val binding by viewBinding(FragmentDebugBinding::bind)
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setHasOptionsMenu(true)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.debug_options, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.wanLog -> {
+                findNavController().navigate(R.id.wanLogFragment)
+                true
+            }
+            R.id.multiPunch -> {
+                findNavController().navigate(R.id.punctureFragment)
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -56,7 +87,7 @@ class DebugFragment : BaseFragment(R.layout.fragment_debug) {
                 append(overlay.javaClass.simpleName)
                 append(" (")
                 val textColorResId = if (overlay.getPeers().isNotEmpty()) R.color.green else R.color.red
-                val textColor = resources.getColor(textColorResId, null)
+                val textColor = ResourcesCompat.getColor(resources, textColorResId, null)
                 inSpans(ForegroundColorSpan(textColor)) {
                     val peers = overlay.getPeers()
                     val peersCountStr = resources.getQuantityString(
@@ -74,7 +105,7 @@ class DebugFragment : BaseFragment(R.layout.fragment_debug) {
             }
             val totalPeersCount = ipv8.network.verifiedPeers.size
             val textColorResId = if (totalPeersCount > 0) R.color.green else R.color.red
-            val textColor = resources.getColor(textColorResId, null)
+            val textColor = ResourcesCompat.getColor(resources, textColorResId, null)
             inSpans(ForegroundColorSpan(textColor)) {
                 append(resources.getQuantityString(R.plurals.x_peers, totalPeersCount, totalPeersCount))
             }
@@ -82,20 +113,27 @@ class DebugFragment : BaseFragment(R.layout.fragment_debug) {
 
         updateBootstrapList()
 
-        lifecycleScope.launch {
+        lifecycleScope.launchWhenCreated {
             val blockCount = withContext(Dispatchers.IO) {
                 getTrustChainCommunity().database.getBlockCount(null)
             }
-            binding.txtBlockCount.text = blockCount.toString()
+            if (view != null) {
+                binding.txtBlockCount.text = blockCount.toString()
+            }
         }
 
-        lifecycleScope.launch {
+        lifecycleScope.launchWhenCreated {
             val chainLength = withContext(Dispatchers.IO) {
                 getTrustChainCommunity().getChainLength()
             }
-            binding.txtChainLength.text = chainLength.toString()
+            if (view != null) {
+                binding.txtChainLength.text = chainLength.toString()
+            }
         }
 
+        binding.txtConnectionType.text = getDemoCommunity().network.wanLog
+            .estimateConnectionType().value
+
         try {
             val pInfo: PackageInfo =
                 requireContext().packageManager.getPackageInfo(requireContext().packageName, 0)
diff --git a/debug/src/main/java/nl/tudelft/trustchain/debug/PunctureFragment.kt b/debug/src/main/java/nl/tudelft/trustchain/debug/PunctureFragment.kt
new file mode 100644
index 000000000..f62df2cfe
--- /dev/null
+++ b/debug/src/main/java/nl/tudelft/trustchain/debug/PunctureFragment.kt
@@ -0,0 +1,128 @@
+package nl.tudelft.trustchain.debug
+
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.asFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.consumeAsFlow
+import nl.tudelft.ipv8.IPv4Address
+import nl.tudelft.ipv8.peerdiscovery.DiscoveryCommunity
+import nl.tudelft.trustchain.common.ui.BaseFragment
+import nl.tudelft.trustchain.common.util.viewBinding
+import nl.tudelft.trustchain.debug.databinding.FragmentPunctureBinding
+import nl.tudelft.trustchain.debug.databinding.FragmentWanLogBinding
+import java.text.SimpleDateFormat
+import java.util.*
+import kotlin.math.max
+import kotlin.math.min
+
+@OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
+class PunctureFragment : BaseFragment(R.layout.fragment_puncture) {
+    private val binding by viewBinding(FragmentPunctureBinding::bind)
+
+    private var sent = 0
+    private var received = 0
+
+    private val receivedMap = mutableMapOf<String, Int>()
+    private val firstMessageTimestamps = mutableMapOf<String, Date>()
+    private var firstSentMessageTimestamp: Date? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        lifecycleScope.launchWhenCreated {
+            while (isActive) {
+                updateView()
+                delay(100)
+            }
+        }
+        lifecycleScope.launchWhenCreated {
+            getDemoCommunity().punctureChannel.asFlow().collect { (peer, payload) ->
+                Log.i("PunctureFragment", "Received puncture from ${peer} on port ${payload.identifier}")
+                received++
+                receivedMap[peer.toString()] = (receivedMap[peer.toString()] ?: 0) + 1
+                if (firstMessageTimestamps[peer.toString()] == null) {
+                    firstMessageTimestamps[peer.toString()] = Date()
+                }
+            }
+        }
+
+        binding.btnPuncture.setOnClickListener {
+            val address = binding.edtAddress.text.toString().split(":")
+            if (address.size == 2) {
+                val ip = address[0]
+                val port = address[1].toIntOrNull() ?: MIN_PORT
+
+                lifecycleScope.launchWhenCreated {
+                    firstSentMessageTimestamp = Date()
+                    if (binding.sweep.isChecked) {
+                        punctureAll(ip, false)
+                        delay(30000)
+                        punctureAll(ip, true)
+                    } else {
+                        punctureSingle(ip, port)
+                    }
+                }
+            }
+        }
+    }
+
+    /*
+    private suspend fun punctureMultiple(ip: String, port: Int) {
+        Log.d("PunctureFragment", "Puncture multiple with initial port: $ip $port")
+        val minPort = max(port - SEARCH_BREADTH/2, MIN_PORT)
+        val maxPort = min(port + SEARCH_BREADTH/2, MAX_PORT)
+        for (i in  minPort .. maxPort) {
+            val ipv4 = IPv4Address(ip, i)
+            getDemoCommunity().sendPuncture(ipv4, i)
+            sent++
+            updateView()
+
+            if (i % 10 == 0) {
+                delay(40)
+            }
+        }
+    }
+    */
+
+    private suspend fun punctureAll(ip: String, slow: Boolean) = with(Dispatchers.Default) {
+        for (i in MIN_PORT..MAX_PORT) {
+            val ipv4 = IPv4Address(ip, i)
+            getDemoCommunity().sendPuncture(ipv4, i)
+            sent++
+
+            if (i % 1000 == 0) {
+                delay(if (slow) 30000L else 1L)
+            }
+        }
+    }
+
+
+    private suspend fun punctureSingle(ip: String, port: Int) {
+        while (true) {
+            val ipv4 = IPv4Address(ip, port)
+            getDemoCommunity().sendPuncture(ipv4, port)
+            sent++
+
+            delay(1000)
+        }
+    }
+
+    private fun updateView() {
+        val df = SimpleDateFormat.getTimeInstance(SimpleDateFormat.MEDIUM)
+        binding.txtResult.text = "Sent: $sent\nFirst Sent: $firstSentMessageTimestamp\nReceived: $received\n\n" + receivedMap.map {
+            val date = firstMessageTimestamps[it.key]
+            val time = if (date != null) df.format(date) else null
+            it.key + " (" + time + ") -> " + it.value
+        }.joinToString("\n")
+    }
+
+    companion object {
+        const val MIN_PORT = 1024
+        const val MAX_PORT = 65535
+        const val SEARCH_BREADTH = 1000
+    }
+}
diff --git a/debug/src/main/java/nl/tudelft/trustchain/debug/WanLogFragment.kt b/debug/src/main/java/nl/tudelft/trustchain/debug/WanLogFragment.kt
new file mode 100644
index 000000000..211f107c7
--- /dev/null
+++ b/debug/src/main/java/nl/tudelft/trustchain/debug/WanLogFragment.kt
@@ -0,0 +1,30 @@
+package nl.tudelft.trustchain.debug
+
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.delay
+import nl.tudelft.ipv8.peerdiscovery.DiscoveryCommunity
+import nl.tudelft.trustchain.common.ui.BaseFragment
+import nl.tudelft.trustchain.common.util.viewBinding
+import nl.tudelft.trustchain.debug.databinding.FragmentWanLogBinding
+import java.text.SimpleDateFormat
+
+class WanLogFragment : BaseFragment(R.layout.fragment_wan_log) {
+    private val binding by viewBinding(FragmentWanLogBinding::bind)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        lifecycleScope.launchWhenStarted {
+            while (true) {
+                val discovery = getIpv8().getOverlay<DiscoveryCommunity>()!!
+                val df = SimpleDateFormat.getTimeInstance(SimpleDateFormat.MEDIUM)
+                binding.txtLog.text = "Time      Sender               My WAN\n" + discovery.network.wanLog.getLog().map {
+                    "" + df.format(it.timestamp) + ": " + it.sender.toString().padEnd(20) + " " + it.wan
+                }.joinToString("\n")
+                delay(1000)
+            }
+        }
+    }
+}
diff --git a/debug/src/main/res/layout/fragment_debug.xml b/debug/src/main/res/layout/fragment_debug.xml
index e58546b24..4f2461341 100644
--- a/debug/src/main/res/layout/fragment_debug.xml
+++ b/debug/src/main/res/layout/fragment_debug.xml
@@ -90,6 +90,21 @@
                 app:fontFamily="monospace"
                 style="@style/TextAppearance.MaterialComponents.Body2"/>
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="Connection Type"
+                style="@style/TextAppearance.MaterialComponents.Subtitle2"/>
+
+            <TextView
+                android:id="@+id/txtConnectionType"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="0"
+                app:fontFamily="monospace"
+                style="@style/TextAppearance.MaterialComponents.Body2"/>
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/debug/src/main/res/layout/fragment_puncture.xml b/debug/src/main/res/layout/fragment_puncture.xml
new file mode 100644
index 000000000..67b81ac61
--- /dev/null
+++ b/debug/src/main/res/layout/fragment_puncture.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <EditText
+        android:id="@+id/edtAddress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:importantForAutofill="no" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <CheckBox
+            android:id="@+id/sweep"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Sweep ports" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btnPuncture"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Puncture" />
+
+    <TextView
+        android:id="@+id/txtResult"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</LinearLayout>
diff --git a/debug/src/main/res/layout/fragment_wan_log.xml b/debug/src/main/res/layout/fragment_wan_log.xml
new file mode 100644
index 000000000..ecc12c48b
--- /dev/null
+++ b/debug/src/main/res/layout/fragment_wan_log.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/txtLog"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:typeface="monospace" />
+</ScrollView>
diff --git a/debug/src/main/res/menu/debug_options.xml b/debug/src/main/res/menu/debug_options.xml
new file mode 100644
index 000000000..6a17ced1c
--- /dev/null
+++ b/debug/src/main/res/menu/debug_options.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/wanLog" android:title="WAN Log" />
+    <item android:id="@+id/multiPunch" android:title="NAT Puncturing" />
+</menu>
diff --git a/debug/src/main/res/navigation/nav_graph_debug.xml b/debug/src/main/res/navigation/nav_graph_debug.xml
index bc6d3848b..c90b2aa8f 100644
--- a/debug/src/main/res/navigation/nav_graph_debug.xml
+++ b/debug/src/main/res/navigation/nav_graph_debug.xml
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/nav_graph"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/nav_graph"
+    android:label="NAT Puncturing"
     app:startDestination="@id/debugFragment">
 
     <fragment
         android:id="@+id/debugFragment"
         android:name="nl.tudelft.trustchain.debug.DebugFragment"
-        android:label="Debug" />
+        android:label="Debug">
+        <action
+            android:id="@+id/action_debugFragment_to_wanLogFragment"
+            app:destination="@id/wanLogFragment" />
+        <action
+            android:id="@+id/action_debugFragment_to_punctureFragment"
+            app:destination="@id/punctureFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/wanLogFragment"
+        android:name="nl.tudelft.trustchain.debug.WanLogFragment"
+        android:label="WAN Log" />
+    <fragment
+        android:id="@+id/punctureFragment"
+        android:name="nl.tudelft.trustchain.debug.PunctureFragment"
+        android:label="NAT Puncturing" />
 </navigation>
diff --git a/distributedai/build.gradle b/distributedai/build.gradle
index fa07e8de6..a9d67a6e9 100644
--- a/distributedai/build.gradle
+++ b/distributedai/build.gradle
@@ -7,7 +7,7 @@ android {
     buildToolsVersion "29.0.2"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 22
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/distributedai/src/main/java/nl/tudelft/trustchain/distributedAI/java/Entity.java b/distributedai/src/main/java/nl/tudelft/trustchain/distributedAI/java/Entity.java
index 712bce9fe..fe80001ae 100644
--- a/distributedai/src/main/java/nl/tudelft/trustchain/distributedAI/java/Entity.java
+++ b/distributedai/src/main/java/nl/tudelft/trustchain/distributedAI/java/Entity.java
@@ -79,7 +79,7 @@ public void run() {
         double perfect_error = Double.isNaN(perfectError_maybeNan) ? 0.01 : perfectError_maybeNan;
         System.out.println("RELATIVE ERROR: " + perfect_error / LSQRS(x,y,average.X(),average.Y()));
 
-        double relative_error = LSQRS(x,y,new LinearRegression(x,y).slope(),new LinearRegression(x,y).intercept()) / Double.max(0.001,LSQRS(x,y,average.X(),average.Y()));
+        double relative_error = LSQRS(x,y,new LinearRegression(x,y).slope(),new LinearRegression(x,y).intercept()) / Math.max(0.001,LSQRS(x,y,average.X(),average.Y()));
     }
 
 
@@ -107,7 +107,7 @@ private void perform() {
 
 
         int it = N;
-        int div = Integer.max(1,N/10);
+        int div = Math.max(1,N/10);
 
         ArrayList<Double> xAxis = new ArrayList<>();
         ArrayList<Double> yAxis = new ArrayList<>();
diff --git a/freedomOfComputing/build.gradle b/freedomOfComputing/build.gradle
index b3e985e2e..37fe7d211 100644
--- a/freedomOfComputing/build.gradle
+++ b/freedomOfComputing/build.gradle
@@ -15,7 +15,7 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 22
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/kotlin-ipv8 b/kotlin-ipv8
index 34af19118..090c03b3a 160000
--- a/kotlin-ipv8
+++ b/kotlin-ipv8
@@ -1 +1 @@
-Subproject commit 34af19118e30784ea773a38cbd6b9e65c37f1685
+Subproject commit 090c03b3af130c643f8c07fedb8b54478bf3045d
diff --git a/musicdao/build.gradle b/musicdao/build.gradle
index 5eaf778aa..08308a2d7 100644
--- a/musicdao/build.gradle
+++ b/musicdao/build.gradle
@@ -12,7 +12,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 22
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/musicdao/src/main/java/com/example/musicdao/Release.kt b/musicdao/src/main/java/com/example/musicdao/Release.kt
index b4329a64a..3c80158e2 100644
--- a/musicdao/src/main/java/com/example/musicdao/Release.kt
+++ b/musicdao/src/main/java/com/example/musicdao/Release.kt
@@ -1,11 +1,11 @@
 package com.example.musicdao
 
 import android.content.Context
-import android.text.Html
 import android.widget.LinearLayout
 import android.widget.TableLayout
 import android.widget.TableRow
 import android.widget.TextView
+import androidx.core.text.HtmlCompat
 import com.github.se_bastiaan.torrentstream.StreamStatus
 import com.github.se_bastiaan.torrentstream.Torrent
 import com.github.se_bastiaan.torrentstream.listeners.TorrentListener
@@ -37,7 +37,7 @@ class Release(
         )
         val blockMetadata = TextView(context)
         blockMetadata.text =
-            Html.fromHtml("Signed block with release:<br>$transaction\n<br><b>" +
+            HtmlCompat.fromHtml("Signed block with release:<br>$transaction\n<br><b>" +
                 "${transaction["artists"]} - ${transaction["title"]}<br>" +
                 "Released at ${transaction["date"]}</b>", 0)
         blockMetadata.layoutParams = TableRow.LayoutParams(
diff --git a/trustchain-explorer/build.gradle b/trustchain-explorer/build.gradle
index 83a7c0f36..316c1d9b5 100644
--- a/trustchain-explorer/build.gradle
+++ b/trustchain-explorer/build.gradle
@@ -17,7 +17,7 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 22
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/blocks/BlockItemRenderer.kt b/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/blocks/BlockItemRenderer.kt
index 9a63d986a..7c10b03cf 100644
--- a/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/blocks/BlockItemRenderer.kt
+++ b/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/blocks/BlockItemRenderer.kt
@@ -1,6 +1,7 @@
 package nl.tudelft.trustchain.explorer.ui.blocks
 
 import android.view.View
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import com.mattskala.itemadapter.ItemLayoutRenderer
 import kotlinx.android.synthetic.main.item_block.view.*
@@ -63,15 +64,15 @@ class BlockItemRenderer(
         when (item.status) {
             BlockItem.BlockStatus.WAITING_FOR_SIGNATURE -> {
                 txtBlockStatus.text = context.getString(R.string.block_status, "Waiting for Signature")
-                txtBlockStatus.setBackgroundColor(context.getColor(R.color.red))
+                txtBlockStatus.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.red, null))
             }
             BlockItem.BlockStatus.SELF_SIGNED -> {
                 txtBlockStatus.text = context.getString(R.string.block_status, "Self-signed")
-                txtBlockStatus.setBackgroundColor(context.getColor(R.color.green))
+                txtBlockStatus.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.green, null))
             }
             BlockItem.BlockStatus.SIGNED -> {
                 txtBlockStatus.text = context.getString(R.string.block_status, "Signed")
-                txtBlockStatus.setBackgroundColor(context.getColor(R.color.green))
+                txtBlockStatus.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.green, null))
             }
         }
     }
diff --git a/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/peers/PeersFragment.kt b/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/peers/PeersFragment.kt
index 4ede70857..0ec0dffff 100644
--- a/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/peers/PeersFragment.kt
+++ b/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/peers/PeersFragment.kt
@@ -3,6 +3,7 @@ package nl.tudelft.trustchain.explorer.ui.peers
 import android.os.Bundle
 import android.view.View
 import android.widget.LinearLayout
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
@@ -57,7 +58,8 @@ class PeersFragment : BaseFragment(R.layout.fragment_peers) {
                     .getWalkableAddresses(demoCommunity.serviceId)
 
                 val discoveredBluetoothAddresses = demoCommunity.network
-                    .getConnectableBluetoothAddresses()
+                    .getNewBluetoothPeerCandidates()
+                    .map { it.address }
 
                 val peerItems = peers.map {
                     PeerItem(
@@ -91,7 +93,7 @@ class PeersFragment : BaseFragment(R.layout.fragment_peers) {
                     peers.size
                 )
                 val textColorResId = if (peers.isNotEmpty()) R.color.green else R.color.red
-                val textColor = resources.getColor(textColorResId, null)
+                val textColor = ResourcesCompat.getColor(resources, textColorResId, null)
                 binding.txtPeerCount.setTextColor(textColor)
                 binding.imgEmpty.isVisible = items.isEmpty()
 
diff --git a/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/users/UserItemRenderer.kt b/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/users/UserItemRenderer.kt
index 1a37d8828..52db0b8b3 100644
--- a/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/users/UserItemRenderer.kt
+++ b/trustchain-explorer/src/main/java/nl/tudelft/trustchain/explorer/ui/users/UserItemRenderer.kt
@@ -1,8 +1,8 @@
 package nl.tudelft.trustchain.explorer.ui.users
 
 import android.annotation.SuppressLint
-import android.text.Html
 import android.view.View
+import androidx.core.text.HtmlCompat
 import com.mattskala.itemadapter.ItemLayoutRenderer
 import kotlinx.android.synthetic.main.item_user.view.*
 import nl.tudelft.trustchain.explorer.R
@@ -18,8 +18,8 @@ class UserItemRenderer(
             R.plurals.x_blocks, item.chainHeight.toInt(), item.chainHeight)
         val storedBlocks = context.resources.getQuantityString(
             R.plurals.x_blocks, item.chainHeight.toInt(), item.storedBlocks)
-        txtChainHeight.text = Html.fromHtml(context.resources.getString(R.string.discovered, discoveredBlocks), 0)
-        txtChainStored.text = Html.fromHtml(context.resources.getString(R.string.stored, storedBlocks), 0)
+        txtChainHeight.text = HtmlCompat.fromHtml(context.resources.getString(R.string.discovered, discoveredBlocks), 0)
+        txtChainStored.text = HtmlCompat.fromHtml(context.resources.getString(R.string.stored, storedBlocks), 0)
         setOnClickListener {
             onItemClick(item)
         }
diff --git a/trustchain-explorer/src/main/res/layout/item_peer.xml b/trustchain-explorer/src/main/res/layout/item_peer.xml
index c143e6807..aacb2ea25 100644
--- a/trustchain-explorer/src/main/res/layout/item_peer.xml
+++ b/trustchain-explorer/src/main/res/layout/item_peer.xml
@@ -14,6 +14,8 @@
         android:layout_height="wrap_content"
         android:textColor="@color/text_primary"
         android:typeface="monospace"
+        android:ellipsize="end"
+        android:lines="1"
         tools:text="4nmZNbpULdgYtjC2CW4NMveU8N6d4WW6" />
 
     <TextView
diff --git a/trustchain-payloadgenerator/build.gradle b/trustchain-payloadgenerator/build.gradle
index 2a74c2d2a..1ad541a5d 100644
--- a/trustchain-payloadgenerator/build.gradle
+++ b/trustchain-payloadgenerator/build.gradle
@@ -18,7 +18,7 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 22
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/trustchain-payloadgenerator/src/main/java/nl/tudelft/trustchain/payloadgenerator/ui/payload/PayloadFragment.kt b/trustchain-payloadgenerator/src/main/java/nl/tudelft/trustchain/payloadgenerator/ui/payload/PayloadFragment.kt
index ad8633311..b4087cfc8 100644
--- a/trustchain-payloadgenerator/src/main/java/nl/tudelft/trustchain/payloadgenerator/ui/payload/PayloadFragment.kt
+++ b/trustchain-payloadgenerator/src/main/java/nl/tudelft/trustchain/payloadgenerator/ui/payload/PayloadFragment.kt
@@ -40,7 +40,7 @@ class PayloadFragment : BaseFragment(R.layout.fragment_payload) {
         adapter.registerRenderer(PayloadItemRenderer {
 
             trustchain.createAcceptTxProposalBlock(it.primaryCurrency, it.secondaryCurrency, it.amount?.toFloat(), it.price?.toFloat(), it.type, it.publicKey)
-            Log.d("PayloadFragment::onCreate", "TX block send to: ${it.publicKey}!")
+            Log.d("PayloadFragment", "TX block send to: ${it.publicKey}!")
         })
     }
 
@@ -114,7 +114,7 @@ class PayloadFragment : BaseFragment(R.layout.fragment_payload) {
                     createPayloadSerializable(amount, price, type)
                 val payload = createPayload(amount, price, type)
                 marketCommunity.broadcast(payloadSerializable)
-                Log.d("TrustChainPayloadGeneratorActivity::sendAutoMessages", "message send!")
+                Log.d("PayloadFragment", "message send!")
                 (TrustChainPayloadGeneratorActivity.PayloadsList).payloads.add(0, payload)
                 recyclerViewPayload.layoutManager!!.smoothScrollToPosition(recyclerViewPayload, RecyclerView.State(), 0)
                 Thread.sleep(1000)
@@ -178,7 +178,7 @@ class PayloadFragment : BaseFragment(R.layout.fragment_payload) {
 
     private fun askListener(payload: TradePayload) {
         Log.d(
-            "PayloadFragment::onViewCreated",
+            "PayloadFragment",
             "New ask came in! They are selling ${payload.amount} ${payload.primaryCurrency}. The price is ${payload.price} ${payload.secondaryCurrency} per ${payload.primaryCurrency}"
         )
         if (!(TrustChainPayloadGeneratorActivity.PayloadsList).payloads.contains(payload)) {
@@ -188,7 +188,7 @@ class PayloadFragment : BaseFragment(R.layout.fragment_payload) {
     }
     private fun bidListener(payload: TradePayload) {
         Log.d(
-            "PayloadFragment::onViewCreated",
+            "PayloadFragment",
             "New bid came in! They are asking ${payload.amount} ${payload.primaryCurrency}. The price is ${payload.price} ${payload.secondaryCurrency} per ${payload.primaryCurrency}"
         )
         if (!(TrustChainPayloadGeneratorActivity.PayloadsList).payloads.contains(payload)) {
diff --git a/trustchain-trader/build.gradle b/trustchain-trader/build.gradle
index d57107202..c975c9f86 100644
--- a/trustchain-trader/build.gradle
+++ b/trustchain-trader/build.gradle
@@ -18,7 +18,7 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 22
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/trustchain-trader/src/main/java/nl/tudelft/trustchain/trader/ui/TraderFragment.kt b/trustchain-trader/src/main/java/nl/tudelft/trustchain/trader/ui/TraderFragment.kt
index 429641286..205ddb62c 100644
--- a/trustchain-trader/src/main/java/nl/tudelft/trustchain/trader/ui/TraderFragment.kt
+++ b/trustchain-trader/src/main/java/nl/tudelft/trustchain/trader/ui/TraderFragment.kt
@@ -116,7 +116,7 @@ class TraderFragment : BaseFragment(R.layout.fragment_trader) {
                         delay(1000)
                     }
                 } catch (e: Exception) {
-                    Log.d("LoadCurrentPayloads exception", e.toString())
+                    Log.d("LoadCurrentPayloads", e.toString())
                 }
             }
         }
@@ -124,7 +124,7 @@ class TraderFragment : BaseFragment(R.layout.fragment_trader) {
 
     fun askListener(payload: TradePayload) {
         Log.d(
-            "PayloadFragment::onViewCreated",
+            "PayloadFragment",
             "New ask came in! They are selling ${payload.amount} ${payload.primaryCurrency}. The price is ${payload.price} ${payload.secondaryCurrency} per ${payload.primaryCurrency}"
         )
         val receivedPayload = TradePayload(payload.publicKey, payload.secondaryCurrency,
@@ -137,7 +137,7 @@ class TraderFragment : BaseFragment(R.layout.fragment_trader) {
                 val price = round(payload.price!!.roundToInt() / payload.amount!!.roundToInt())
                 if (ai.predict(price) == 0) {
                     Log.d(
-                        "PayloadFragment::onViewCreated",
+                        "PayloadFragment",
                         "Accepted!"
                     )
                     accept(receivedPayload, 0)
@@ -153,7 +153,7 @@ class TraderFragment : BaseFragment(R.layout.fragment_trader) {
 
     fun bidListener(payload: TradePayload) {
         Log.d(
-            "PayloadFragment::onViewCreated",
+            "PayloadFragment",
             "New bid came in! They are asking ${payload.amount} ${payload.primaryCurrency}. The price is ${payload.price} ${payload.secondaryCurrency} per ${payload.primaryCurrency}"
         )
         val receivedPayload = TradePayload(payload.publicKey, payload.secondaryCurrency,
diff --git a/trustchain-trader/src/main/java/nl/tudelft/trustchain/trader/ui/peers/PeersFragment.kt b/trustchain-trader/src/main/java/nl/tudelft/trustchain/trader/ui/peers/PeersFragment.kt
index d5f999120..4229f440a 100644
--- a/trustchain-trader/src/main/java/nl/tudelft/trustchain/trader/ui/peers/PeersFragment.kt
+++ b/trustchain-trader/src/main/java/nl/tudelft/trustchain/trader/ui/peers/PeersFragment.kt
@@ -3,6 +3,7 @@ package nl.tudelft.trustchain.trader.ui.peers
 import android.os.Bundle
 import android.view.View
 import android.widget.LinearLayout
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
@@ -54,9 +55,6 @@ class PeersFragment : BaseFragment(R.layout.fragment_peers) {
                 val discoveredAddresses = marketCommunity.network
                     .getWalkableAddresses(marketCommunity.serviceId)
 
-                val discoveredBluetoothAddresses = marketCommunity.network
-                    .getConnectableBluetoothAddresses()
-
                 val peerItems = peers.map {
                     PeerItem(
                         it
@@ -72,15 +70,7 @@ class PeersFragment : BaseFragment(R.layout.fragment_peers) {
                     )
                 }
 
-                val bluetoothAddressItems = discoveredBluetoothAddresses.map { address ->
-                    AddressItem(
-                        address,
-                        null,
-                        null
-                    )
-                }
-
-                val items = peerItems + bluetoothAddressItems + addressItems
+                val items = peerItems + addressItems
 
                 adapter.updateItems(items)
                 binding.txtCommunityName.text = marketCommunity.javaClass.simpleName
@@ -89,7 +79,7 @@ class PeersFragment : BaseFragment(R.layout.fragment_peers) {
                     peers.size
                 )
                 val textColorResId = if (peers.isNotEmpty()) R.color.green else R.color.red
-                val textColor = resources.getColor(textColorResId, null)
+                val textColor = ResourcesCompat.getColor(resources, textColorResId, null)
                 binding.txtPeerCount.setTextColor(textColor)
                 binding.imgEmpty.isVisible = items.isEmpty()
 
diff --git a/trustchain-voter/build.gradle b/trustchain-voter/build.gradle
index b11c0b39e..a680e5771 100644
--- a/trustchain-voter/build.gradle
+++ b/trustchain-voter/build.gradle
@@ -15,7 +15,7 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 22
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/trustchain-voter/src/main/java/nl/tudelft/trustchain/voting/VotingActivity.kt b/trustchain-voter/src/main/java/nl/tudelft/trustchain/voting/VotingActivity.kt
index ee3f2cc88..f96290663 100644
--- a/trustchain-voter/src/main/java/nl/tudelft/trustchain/voting/VotingActivity.kt
+++ b/trustchain-voter/src/main/java/nl/tudelft/trustchain/voting/VotingActivity.kt
@@ -3,7 +3,6 @@ package nl.tudelft.trustchain.voting
 import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.os.Bundle
-import android.text.Html
 import android.text.format.DateFormat
 import android.view.LayoutInflater
 import android.widget.EditText
@@ -11,6 +10,7 @@ import android.widget.Switch
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.text.HtmlCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.activity_main_voting.*
@@ -209,7 +209,7 @@ class VotingActivity : AppCompatActivity() {
 
         // Show vote subject, proposer and current tally
         builder.setMessage(
-            Html.fromHtml(
+            HtmlCompat.fromHtml(
                 "<big>\"" + voteSubject + "\"</big>" +
                     "<br><br>" +
                     "<small><b>Proposed by</b>:" +
@@ -235,7 +235,7 @@ class VotingActivity : AppCompatActivity() {
                             tally.first.toString() + " in favour"
                         }
                     } + "</small></i>",
-                Html.FROM_HTML_MODE_LEGACY
+                HtmlCompat.FROM_HTML_MODE_LEGACY
             )
         )