Tweaked for Qonect