diff --git a/plugins/tools/selectiontools/KisMagneticGraph.h b/plugins/tools/selectiontools/KisMagneticGraph.h
index 95e93ad171..d22ca468a5 100644
--- a/plugins/tools/selectiontools/KisMagneticGraph.h
+++ b/plugins/tools/selectiontools/KisMagneticGraph.h
@@ -1,247 +1,255 @@
 /*
  *  Copyright (c) 2019 Kuntal Majumder <hellozee@disroot.org>
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; version 2.1 of the License.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef KISMAGNETICGRAPH_H
 #define KISMAGNETICGRAPH_H
 
 #include <boost/operators.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <kis_paint_device.h>
 #include <kis_random_accessor_ng.h>
 
 #include <QDebug>
 #include <QRect>
 #include <QColor>
 
 struct VertexDescriptor {
 
     long x,y;
 
     enum Direction {
         MIN = 0,
-        N = MIN, S, E, W, NONE
+        N = MIN, S, E, W, NW, NE, SW, SE, NONE
     };
 
     VertexDescriptor(long _x, long _y):
         x(_x), y(_y)
     { }
 
     VertexDescriptor(QPoint pt):
         x(pt.x()), y(pt.y())
     { }
 
     VertexDescriptor():
         x(0), y(0)
     { }
 
     bool operator==(VertexDescriptor const &rhs) const {
         return rhs.x == x && rhs.y == y;
     }
 
     bool operator==(QPoint const &rhs) const {
         return rhs.x() == x && rhs.y() == y;
     }
 
     bool operator !=(VertexDescriptor const &rhs) const {
         return rhs.x != x || rhs.y != y;
     }
 
     bool operator<(VertexDescriptor const &rhs) const {
         return x < rhs.x || (x == rhs.x && y < rhs.y);
     }
 
     VertexDescriptor neighbor(Direction direction) const {
 
         int dx = 0, dy = 0;
 
         switch (direction){
-            case W:
-                dx = -1;
-                break;
-            case E:
-                dx = 1;
-                break;
-            case N:
-                dy = -1;
-                break;
-            case S:
-                dy = 1;
+        case W:
+        case SW:
+        case NW:
+            dx = -1;
+            break;
+        case E:
+        case SE:
+        case NE:
+            dx = 1;
+        }
+
+        switch(direction){
+        case N:
+        case NW:
+        case NE:
+            dy = -1;
+            break;
+        case S:
+        case SW:
+        case SE:
+            dy = 1;
         }
 
         VertexDescriptor const neighbor(x + dx, y + dy);
         return neighbor;
     }
 };
 
 QDebug operator<<(QDebug dbg, const VertexDescriptor &v) {
     dbg.nospace() << "(" << v.x << ", " << v.y << ")";
     return dbg.space();
 }
 
 struct neighbour_iterator;
 
 struct KisMagneticGraph{
 
     typedef KisMagneticGraph type;
 
     KisMagneticGraph() { }
     KisMagneticGraph(KisPaintDeviceSP dev, QRect graphRect):
         m_rect(graphRect), m_dev(dev)
     { }
 
     typedef VertexDescriptor                                vertex_descriptor;
     typedef std::pair<vertex_descriptor, vertex_descriptor> edge_descriptor;
     typedef boost::undirected_tag                           directed_category;
     typedef boost::disallow_parallel_edge_tag               edge_parallel_category;
     typedef boost::incidence_graph_tag                      traversal_category;
     typedef neighbour_iterator                              out_edge_iterator;
     typedef unsigned                                        degree_size_type;
 
 
     double getIntensity(VertexDescriptor pt){
         KisRandomAccessorSP randAccess = m_dev->createRandomAccessorNG(m_dev->exactBounds().x(),m_dev->exactBounds().y());
         randAccess->moveTo(pt.x, pt.y);
         qint8 val = *(randAccess->rawData());
-        return std::abs(val);
+        //offsetting the value, so we don't get negatives
+        return val + 255;
     }
 
     unsigned outDegree(VertexDescriptor pt){
         //corners
         if(pt == m_rect.topLeft() || pt == m_rect.topRight() ||
                 pt == m_rect.bottomLeft() || pt == m_rect.bottomRight()){
             if(m_rect.width() == 1 || m_rect.height() == 1)
                 return 1;
-            return 2;
+            return 3;
         }
 
         //edges
         if(pt.x == m_rect.topLeft().x() || pt.y == m_rect.topLeft().y()  ||
                 pt.x == m_rect.bottomRight().x() || pt.y == m_rect.bottomRight().y()){
             if(m_rect.width() == 1 || m_rect.height() == 1)
                 return 2;
-            return 3;
+            return 5;
         }
 
-        return 4;
+        return 8;
 
     }
 
     QRect m_rect;
 
 private:
     KisPaintDeviceSP m_dev;
 };
 
 struct neighbour_iterator : public boost::iterator_facade<neighbour_iterator,
                                std::pair<VertexDescriptor, VertexDescriptor>,
                                                 boost::forward_traversal_tag,
                                std::pair<VertexDescriptor, VertexDescriptor>>
 {
 
     neighbour_iterator(VertexDescriptor v, KisMagneticGraph g, VertexDescriptor::Direction d):
         m_point(v), m_direction(d), m_graph(g)
-    {
-        //qDebug() << v;
-    }
+    { }
 
     neighbour_iterator()
     { }
 
     std::pair<VertexDescriptor, VertexDescriptor>
     operator*() const {
         std::pair<VertexDescriptor, VertexDescriptor> const result = std::make_pair(m_point, m_point.neighbor(m_direction));
         return result;
     }
 
     void operator++() {
         m_direction = static_cast<VertexDescriptor::Direction>(int(m_direction)+1);
         VertexDescriptor next = m_point.neighbor(m_direction);
         if(m_direction == VertexDescriptor::NONE){
             return;
         }
         if(!m_graph.m_rect.contains(next.x, next.y)){
-            qDebug() << next;
             operator++();
         }
     }
 
     bool operator==(neighbour_iterator const& that) const {
         return m_point == that.m_point && m_direction == that.m_direction;
     }
 
     bool equal(neighbour_iterator const& that) const {
         return operator==(that);
     }
 
     void increment() {
         operator++();
     }
 
 private:
     VertexDescriptor m_point;
     VertexDescriptor::Direction m_direction;
     KisMagneticGraph m_graph;
 };
 
 namespace boost{
 template<>
 struct graph_traits<KisMagneticGraph> {
     typedef typename KisMagneticGraph::vertex_descriptor      vertex_descriptor;
     typedef typename KisMagneticGraph::edge_descriptor        edge_descriptor;
     typedef typename KisMagneticGraph::out_edge_iterator      out_edge_iterator;
     typedef typename KisMagneticGraph::directed_category      directed_category;
     typedef typename KisMagneticGraph::edge_parallel_category edge_parallel_category;
     typedef typename KisMagneticGraph::traversal_category     traversal_category;
     typedef typename KisMagneticGraph::degree_size_type       degree_size_type;
 
     typedef void in_edge_iterator;
     typedef void vertex_iterator;
     typedef void vertices_size_type;
     typedef void edge_iterator;
     typedef void edges_size_type;
 };
 }
 
 // Requirements for an Incidence Graph,
 // https://www.boost.org/doc/libs/1_70_0/libs/graph/doc/IncidenceGraph.html
 
 typename KisMagneticGraph::vertex_descriptor
 source(typename KisMagneticGraph::edge_descriptor e, KisMagneticGraph g) {
     Q_UNUSED(g)
     return e.first;
 }
 
 typename KisMagneticGraph::vertex_descriptor
 target(typename KisMagneticGraph::edge_descriptor e, KisMagneticGraph g) {
     Q_UNUSED(g)
     return e.second;
 }
 
 std::pair<KisMagneticGraph::out_edge_iterator, KisMagneticGraph::out_edge_iterator>
 out_edges(typename KisMagneticGraph::vertex_descriptor v, KisMagneticGraph g) {
     return std::make_pair(
                 KisMagneticGraph::out_edge_iterator(v, g, VertexDescriptor::Direction::MIN),
                 KisMagneticGraph::out_edge_iterator(v, g, VertexDescriptor::Direction::NONE)
                 );
 }
 
 typename KisMagneticGraph::degree_size_type
 out_degree(typename KisMagneticGraph::vertex_descriptor v, KisMagneticGraph g) {
     return g.outDegree(v);
 }
 
 #endif
diff --git a/plugins/tools/selectiontools/KisMagneticWorker.cc b/plugins/tools/selectiontools/KisMagneticWorker.cc
index ab42bceb79..98d9f14452 100644
--- a/plugins/tools/selectiontools/KisMagneticWorker.cc
+++ b/plugins/tools/selectiontools/KisMagneticWorker.cc
@@ -1,225 +1,218 @@
 /*
  *  Copyright (c) 2019 Kuntal Majumder <hellozee@disroot.org>
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; version 2.1 of the License.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "KisMagneticWorker.h"
 
 #include <kis_gaussian_kernel.h>
 #include <lazybrush/kis_lazy_fill_tools.h>
 
 #include <QtCore>
 #include <QPolygon>
 
 #include <boost/graph/astar_search.hpp>
 
 #include "KisMagneticGraph.h"
 
 struct DistanceMap {
     typedef VertexDescriptor key_type;
     typedef double data_type;
     typedef std::pair<key_type, data_type> value_type;
 
     DistanceMap(double const& dval)
             : m_default(dval)
     { }
 
     data_type &operator[](key_type const& k) {
         if (m.find(k) == m.end())
             m[k] = m_default;
         return m[k];
     }
 
 private:
     std::map<key_type, data_type> m;
     data_type const m_default;
 };
 
 struct PredecessorMap{
     PredecessorMap()
     { }
 
     PredecessorMap(PredecessorMap const& that):
     m_map(that.m_map)
     { }
 
     typedef VertexDescriptor key_type;
     typedef VertexDescriptor value_type;
     typedef VertexDescriptor & reference_type;
     typedef boost::read_write_property_map_tag category;
 
     VertexDescriptor &operator[](VertexDescriptor v){
         return m_map[v];
     }
 
     std::map<VertexDescriptor, VertexDescriptor> m_map;
 };
 
 VertexDescriptor get(PredecessorMap const &m, VertexDescriptor v){
     typename std::map<VertexDescriptor, VertexDescriptor>::const_iterator found = m.m_map.find(v);
     return found != m.m_map.end() ? found->second : v;
 }
 
 void put(PredecessorMap &m, VertexDescriptor key, VertexDescriptor value){
     m.m_map[key] = value;
 }
 
 double EuclideanDistance(VertexDescriptor p1, VertexDescriptor p2){
     return std::sqrt(std::pow(p1.y-p2.y, 2) + std::pow(p1.x-p2.x, 2));
 }
 
 class AStarHeuristic : public boost::astar_heuristic<KisMagneticGraph, double> {
     private:
-        PredecessorMap m_pmap;
         VertexDescriptor m_goal;
         double coeff_a, coeff_b;
 
     public:
-        AStarHeuristic(VertexDescriptor goal, PredecessorMap const &pmap, double a, double b):
-            m_pmap(pmap), m_goal(goal), coeff_a(a), coeff_b(b)
+        AStarHeuristic(VertexDescriptor goal, double a, double b):
+            m_goal(goal), coeff_a(a), coeff_b(b)
         { }
 
-        AStarHeuristic(VertexDescriptor goal, PredecessorMap const &pmap):
-            m_pmap(pmap), m_goal(goal), coeff_a(0.5), coeff_b(0.5)
+        AStarHeuristic(VertexDescriptor goal):
+            m_goal(goal), coeff_a(0.5), coeff_b(0.5)
         { }
 
         double operator()(VertexDescriptor v){
-            auto prev = m_pmap[v];
-            double di = (m_goal.y - prev.y) * v.x + (m_goal.x - prev.x) * v.y;
-            di = std::abs(di + prev.x * m_goal.y + prev.y * m_goal.x);
-            double dz = EuclideanDistance(prev, m_goal);
-            di = di/dz;
-            double dm = EuclideanDistance(v, m_goal);
-            //return coeff_a * di + coeff_b * (dm - dz);
             return EuclideanDistance(v,m_goal);
         }
 };
 
 struct GoalFound {};
 
 class AStarGoalVisitor : public boost::default_astar_visitor {
     public:
         AStarGoalVisitor(VertexDescriptor goal) : m_goal(goal) { }
 
         void examine_vertex(VertexDescriptor u, KisMagneticGraph const &g) {
             Q_UNUSED(g)
             if(u == m_goal){
                 throw GoalFound();
             }
         }
 
     private:
         VertexDescriptor m_goal;
 };
 
 struct WeightMap{
     typedef std::pair<VertexDescriptor, VertexDescriptor> key_type;
     typedef double data_type;
     typedef std::pair<key_type, data_type> value_type;
 
     WeightMap() { }
 
     WeightMap(KisMagneticGraph g):
         m_graph(g)
     { }
 
     data_type& operator[](key_type const& k) {
         if (m_map.find(k) == m_map.end()) {
-            double edge_gradient = m_graph.getIntensity((k.first)) + m_graph.getIntensity((k.second))/2;
+            double edge_gradient = (m_graph.getIntensity(k.first) + m_graph.getIntensity(k.second))/2;
             m_map[k] = EuclideanDistance(k.first, k.second) * (edge_gradient + 1);
         }
         return m_map[k];
     }
 
 private:
     std::map<key_type, data_type> m_map;
     KisMagneticGraph m_graph;
 };
 
 QRect KisMagneticWorker::calculateRect(QPoint p1, QPoint p2, int radius) const {
     // I am sure there is a simpler version of it which exists but well
 
     double slope = (p2.y() - p1.y())/(p2.x() - p1.x());
     QPoint a,b,c,d;
     if(slope != 0){
         slope = -1/slope;
         double denom = 2 * std::sqrt(slope*slope+1);
         double numer = radius/denom;
         double fac1 = numer/denom;
         denom = 2 * denom;
         numer = 3 * slope * numer;
         double fac2 = numer/denom;
         a = QPoint(p1.x() - fac1, p1.y() - fac2);
         b = QPoint(p1.x() + fac1, p1.y() + fac2);
         c = QPoint(p2.x() - fac1, p2.y() - fac2);
         d = QPoint(p2.x() + fac1, p2.y() + fac2);
     }else{
         double fac = radius/2;
         a = QPoint(p1.x() - fac, p1.y() - fac);
         b = QPoint(p1.x() + fac, p1.y() + fac);
         c = QPoint(p2.x() - fac, p2.y() - fac);
         d = QPoint(p2.x() + fac, p2.y() + fac);
     }
 
     QPolygon p(QVector<QPoint>{a,b,c,d});
     return p.boundingRect();
 }
 
 QVector<QPointF> KisMagneticWorker::computeEdge(KisPaintDeviceSP dev, int radius, QPoint begin, QPoint end) {
 
     QRect rect = calculateRect(begin, end, radius);
     KisGaussianKernel::applyLoG(dev, rect, 2, 1.0, QBitArray(), 0);
     KisLazyFillTools::normalizeAndInvertAlpha8Device(dev, rect);
 
     VertexDescriptor goal(end);
     VertexDescriptor start(begin);
 
     KisMagneticGraph g(dev, rect);
 
     // How many maps does it require?
     PredecessorMap pmap;
     DistanceMap dmap(std::numeric_limits<double>::max());
     dmap[start] = 0;
     std::map<VertexDescriptor, double> rmap;
     std::map<VertexDescriptor, boost::default_color_type> cmap;
     std::map<VertexDescriptor, double> imap;
     WeightMap wmap(g);
-    AStarHeuristic heuristic(goal, pmap);
+    AStarHeuristic heuristic(goal);
     QVector<QPointF> result;
 
     try{
         boost::astar_search_no_init(
                     g, start, heuristic
                     ,boost::visitor(AStarGoalVisitor(goal))
                     .distance_map(boost::associative_property_map<DistanceMap>(dmap))
                     .predecessor_map(boost::ref(pmap))
                     .weight_map(boost::associative_property_map<WeightMap>(wmap))
                     .vertex_index_map(boost::associative_property_map<std::map<VertexDescriptor, double>>(imap))
                     .rank_map(boost::associative_property_map<std::map<VertexDescriptor, double>>(rmap))
                     .color_map(boost::associative_property_map<std::map<VertexDescriptor, boost::default_color_type>>(cmap))
                     .distance_combine(std::plus<double>())
                     .distance_compare(std::less<double>())
                     );
 
     }catch(GoalFound const&){
         for(VertexDescriptor u=goal; u!=start; u = pmap[u]){
             result.push_back(QPointF(u.x,u.y));
+            //qDebug() << g.getIntensity(u);
         }
     }
 
     result.push_back(QPoint(start.x,start.y));
 
     return result;
 }