diff --git a/plugins/tools/selectiontools/KisMagneticWorker.cc b/plugins/tools/selectiontools/KisMagneticWorker.cc
index 313f641360..31af15e33c 100644
--- a/plugins/tools/selectiontools/KisMagneticWorker.cc
+++ b/plugins/tools/selectiontools/KisMagneticWorker.cc
@@ -1,195 +1,190 @@
+#include <utility>
+
 /*
  *  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 <kis_algebra_2d.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)
+    explicit 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() = default;
 
-    PredecessorMap(PredecessorMap const& that):
-    m_map(that.m_map)
-    { }
+    PredecessorMap(PredecessorMap const& that) = default;
 
     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);
+    auto 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:
         VertexDescriptor m_goal;
-        double coeff_a, coeff_b;
 
     public:
-        AStarHeuristic(VertexDescriptor goal, double a, double b):
-            m_goal(goal), coeff_a(a), coeff_b(b)
+        explicit AStarHeuristic(VertexDescriptor goal):
+            m_goal(goal)
         { }
 
-        AStarHeuristic(VertexDescriptor goal):
-            m_goal(goal), coeff_a(0.5), coeff_b(0.5)
-        { }
-
-        double operator()(VertexDescriptor v){
+        double operator()(VertexDescriptor v) {
             return EuclideanDistance(v,m_goal);
         }
 };
 
 struct GoalFound {};
 
 class AStarGoalVisitor : public boost::default_astar_visitor {
     public:
-        AStarGoalVisitor(VertexDescriptor goal) : m_goal(goal) { }
+        explicit 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() = default;
 
-    WeightMap(KisMagneticGraph g):
+    explicit WeightMap(const 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;
             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;
 };
 
-KisMagneticWorker::KisMagneticWorker(KisPaintDeviceSP dev) :
+KisMagneticWorker::KisMagneticWorker(const KisPaintDeviceSP& dev) :
     m_dev(dev)
 { }
 
 QVector<QPointF> KisMagneticWorker::computeEdge(int radius, QPoint begin, QPoint end) {
 
-    //QRect rect = calculateRect(begin, end, radius);
     QRect rect(QPoint(0,0), QSize(radius*2, radius*2));
     rect.moveCenter(begin);
 
-    KisGaussianKernel::applyLoG(m_dev, rect, 2, 1.0, QBitArray(), 0);
+    KisAlgebra2D::accumulateBounds(end, &rect);
+
+    KisGaussianKernel::applyLoG(m_dev, rect, 2, 1.0, QBitArray(), nullptr);
     KisLazyFillTools::normalizeAndInvertAlpha8Device(m_dev, rect);
 
     VertexDescriptor goal(end);
     VertexDescriptor start(begin);
     KisMagneticGraph g(m_dev, rect);
 
     // How many maps does it require?
     // Take a look here, if it doesn't make sense, https://www.boost.org/doc/libs/1_70_0/libs/graph/doc/astar_search.html
     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);
     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_front(QPointF(u.x,u.y));
         }
     }
 
     result.push_front(QPoint(start.x,start.y));
 
     return result;
 }
diff --git a/plugins/tools/selectiontools/KisMagneticWorker.h b/plugins/tools/selectiontools/KisMagneticWorker.h
index db0fa37309..c44c356d2e 100644
--- a/plugins/tools/selectiontools/KisMagneticWorker.h
+++ b/plugins/tools/selectiontools/KisMagneticWorker.h
@@ -1,36 +1,36 @@
 /*
  *  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 KISMAGNETICWORKER_H
 #define KISMAGNETICWORKER_H
 
 #include <kis_paint_device.h>
 #include <kritaselectiontools_export.h>
 
 class KRITASELECTIONTOOLS_EXPORT KisMagneticWorker{
 public:
     KisMagneticWorker() {
         //Do not use this, just for making the compiler happy
     }
 
-    KisMagneticWorker(KisPaintDeviceSP dev);
+    KisMagneticWorker(const KisPaintDeviceSP& dev);
     QVector<QPointF> computeEdge(int radius, QPoint start, QPoint end);
 private:
     KisPaintDeviceSP m_dev;
 };
 
 #endif
diff --git a/plugins/tools/selectiontools/KisToolSelectMagnetic.cc b/plugins/tools/selectiontools/KisToolSelectMagnetic.cc
index 2a9b8377b8..4b374c0689 100644
--- a/plugins/tools/selectiontools/KisToolSelectMagnetic.cc
+++ b/plugins/tools/selectiontools/KisToolSelectMagnetic.cc
@@ -1,273 +1,284 @@
 /*
  *  Copyright (c) 2019 Kuntal Majumder <hellozee@disroot.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program 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 General Public License for more details.
  *
  *  You should have received a copy of the GNU 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 "KisToolSelectMagnetic.h"
 
 #include <QApplication>
 #include <QPainter>
 #include <QWidget>
 #include <QPainterPath>
 #include <QLayout>
 #include <QVBoxLayout>
 
 #include <kis_debug.h>
 #include <klocalizedstring.h>
 
 #include <KoPointerEvent.h>
 #include <KoShapeController.h>
 #include <KoPathShape.h>
 #include <KoColorSpace.h>
 #include <KoCompositeOp.h>
 #include <KoViewConverter.h>
 
 #include <kis_layer.h>
 #include <kis_selection_options.h>
 #include <kis_cursor.h>
 #include <kis_image.h>
 
 #include "kis_painter.h"
 #include <brushengine/kis_paintop_registry.h>
 #include "canvas/kis_canvas2.h"
 #include "kis_pixel_selection.h"
 #include "kis_selection_tool_helper.h"
 
 #include "kis_algebra_2d.h"
 
 #define FEEDBACK_LINE_WIDTH 2
 
 
 KisToolSelectMagnetic::KisToolSelectMagnetic(KoCanvasBase *canvas)
     : KisToolSelect(canvas,
                     KisCursor::load("tool_magnetic_selection_cursor.svg", 16, 16),
                     i18n("Magnetic Selection")),
       m_continuedMode(false), m_complete(true), m_checkPoint(0), m_radius(20)
 { }
 
 KisToolSelectMagnetic::~KisToolSelectMagnetic()
 {
 }
 
 void KisToolSelectMagnetic::keyPressEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Control) {
         m_continuedMode = true;
     }
 
     KisToolSelect::keyPressEvent(event);
 }
 
 void KisToolSelectMagnetic::keyReleaseEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Control ||
         !(event->modifiers() & Qt::ControlModifier)) {
 
         m_continuedMode = false;
         if (mode() != PAINT_MODE && !m_points.isEmpty()) {
             finishSelectionAction();
         }
     }
 
     KisToolSelect::keyReleaseEvent(event);
 }
 
 //the cursor is still tracked even when no mousebutton is pressed
 void KisToolSelectMagnetic::mouseMoveEvent(KoPointerEvent *event)
 {
     KisToolSelect::mouseMoveEvent(event);
     if(m_complete){
         //finishSelectionAction();
         return;
     }
 
     m_lastCursorPos = convertToPixelCoord(event);
-    auto current = QPoint(m_lastCursorPos.x(), m_lastCursorPos.y());
-    auto point_set = m_worker.computeEdge(m_radius, m_lastAnchor, current);
-
+    QPoint current(m_lastCursorPos.x(), m_lastCursorPos.y());
+    QVector<QPointF> point_set = m_worker.computeEdge(m_radius, m_lastAnchor, current);
     int num = m_points.count();
     m_points.resize(m_radius * (num/m_radius));
     m_points.append(point_set);
     num = m_points.count();
-    if(num/20 >= 1) {
+    if(num/m_radius > 0) {
         m_checkPoint = m_radius * (num/m_radius) - 1;
         m_lastAnchor = QPoint(m_points[m_checkPoint].x(), m_points[m_checkPoint].y());
-        qDebug() << m_lastAnchor;
+        m_anchorPoints.push_back(m_lastAnchor);
     }
 
     m_paintPath = QPainterPath();
     m_paintPath.moveTo(pixelToView(m_points[0]));
     for(int i=1; i<m_points.count();i++){
         m_paintPath.lineTo(pixelToView(m_points[i]));
     }
 
     updateFeedback();
 
     if (m_continuedMode && mode() != PAINT_MODE) {
         updateContinuedMode();
     }
 }
 
 //press primary mouse button
 void KisToolSelectMagnetic::beginPrimaryAction(KoPointerEvent *event)
 {
     setMode(KisTool::PAINT_MODE);
-    auto temp = convertToPixelCoord(event);
+    QPointF temp(convertToPixelCoord(event));
     m_lastAnchor = QPoint(temp.x(), temp.y());
-    qDebug() << m_lastAnchor;
-    m_complete = !m_complete; //just for testing
+
+    if(m_anchorPoints.count() == 0){
+        m_snapBound = QRect(QPoint(0,0), QSize(10,10));
+        m_snapBound.moveCenter(m_lastAnchor);
+    }
+
+    if(m_anchorPoints.count() > 0 && m_snapBound.contains(m_lastAnchor)){
+        m_complete = true;
+        finishSelectionAction();
+        return;
+    }
+
+    m_complete = false;
+    m_anchorPoints.push_back(m_lastAnchor);
 }
 
 //drag while primary mouse button is pressed
 void KisToolSelectMagnetic::continuePrimaryAction(KoPointerEvent *event)
 {
     KisToolSelectBase::continuePrimaryAction(event);
 }
 
 //release primary mouse button
 void KisToolSelectMagnetic::endPrimaryAction(KoPointerEvent *event)
 {
     KisToolSelectBase::endPrimaryAction(event);
 }
 
 void KisToolSelectMagnetic::finishSelectionAction()
 {
     KisCanvas2 * kisCanvas = dynamic_cast<KisCanvas2*>(canvas());
     KIS_ASSERT_RECOVER_RETURN(kisCanvas);
     kisCanvas->updateCanvas();
     setMode(KisTool::HOVER_MODE);
 
     QRectF boundingViewRect =
         pixelToView(KisAlgebra2D::accumulateBounds(m_points));
 
     KisSelectionToolHelper helper(kisCanvas, kundo2_i18n("Select by Outline"));
 
     if (m_points.count() > 2 &&
         !helper.tryDeselectCurrentSelection(boundingViewRect, selectionAction())) {
         QApplication::setOverrideCursor(KisCursor::waitCursor());
 
         const SelectionMode mode =
             helper.tryOverrideSelectionMode(kisCanvas->viewManager()->selection(),
                                             selectionMode(),
                                             selectionAction());
 
         if (mode == PIXEL_SELECTION) {
 
             KisPixelSelectionSP tmpSel = KisPixelSelectionSP(new KisPixelSelection());
 
             KisPainter painter(tmpSel);
             painter.setPaintColor(KoColor(Qt::black, tmpSel->colorSpace()));
             painter.setAntiAliasPolygonFill(antiAliasSelection());
             painter.setFillStyle(KisPainter::FillStyleForegroundColor);
             painter.setStrokeStyle(KisPainter::StrokeStyleNone);
 
             painter.paintPolygon(m_points);
 
             QPainterPath cache;
             cache.addPolygon(m_points);
             cache.closeSubpath();
             tmpSel->setOutlineCache(cache);
 
             helper.selectPixelSelection(tmpSel, selectionAction());
         } else {
 
             KoPathShape* path = new KoPathShape();
             path->setShapeId(KoPathShapeId);
 
             QTransform resolutionMatrix;
             resolutionMatrix.scale(1 / currentImage()->xRes(), 1 / currentImage()->yRes());
             path->moveTo(resolutionMatrix.map(m_points[0]));
             for (int i = 1; i < m_points.count(); i++)
                 path->lineTo(resolutionMatrix.map(m_points[i]));
             path->close();
             path->normalize();
 
             helper.addSelectionShape(path, selectionAction());
         }
         QApplication::restoreOverrideCursor();
     }
     m_points.clear();
     m_paintPath = QPainterPath();
 }
 
 void KisToolSelectMagnetic::paint(QPainter& gc, const KoViewConverter &converter)
 {
     Q_UNUSED(converter);
 
     if ((mode() == KisTool::PAINT_MODE || m_continuedMode) &&
         !m_points.isEmpty()) {
 
         QPainterPath outline = m_paintPath;
         if (m_continuedMode && mode() != KisTool::PAINT_MODE) {
             outline.lineTo(pixelToView(m_lastCursorPos));
         }
         paintToolOutline(&gc, outline);
     }
 }
 
 void KisToolSelectMagnetic::updateFeedback()
 {
     if (m_points.count() > 1) {
         qint32 lastPointIndex = m_points.count() - 1;
 
         QRectF updateRect = QRectF(m_points[lastPointIndex - 1], m_points[lastPointIndex]).normalized();
         updateRect = kisGrowRect(updateRect, FEEDBACK_LINE_WIDTH);
 
         updateCanvasPixelRect(updateRect);
     }
 }
 
 void KisToolSelectMagnetic::updateContinuedMode()
 {
     if (!m_points.isEmpty()) {
         qint32 lastPointIndex = m_points.count() - 1;
 
         QRectF updateRect = QRectF(m_points[lastPointIndex - 1], m_lastCursorPos).normalized();
         updateRect = kisGrowRect(updateRect, FEEDBACK_LINE_WIDTH);
 
         updateCanvasPixelRect(updateRect);
     }
 }
 
 void KisToolSelectMagnetic::activate(KoToolBase::ToolActivation activation, const QSet<KoShape*> &shapes)
 {
     m_worker = KisMagneticWorker(image()->projection());
     KisToolSelect::activate(activation, shapes);
 }
 
 void KisToolSelectMagnetic::deactivate()
 {
     KisCanvas2 * kisCanvas = dynamic_cast<KisCanvas2*>(canvas());
     KIS_ASSERT_RECOVER_RETURN(kisCanvas);
     kisCanvas->updateCanvas();
 
     m_continuedMode = false;
     m_complete = true;
 
     KisTool::deactivate();
 }
 
 void KisToolSelectMagnetic::resetCursorStyle()
 {
     if (selectionAction() == SELECTION_ADD) {
         useCursor(KisCursor::load("tool_outline_selection_cursor_add.png", 6, 6));
     } else if (selectionAction() == SELECTION_SUBTRACT) {
         useCursor(KisCursor::load("tool_outline_selection_cursor_sub.png", 6, 6));
     } else {
         KisToolSelect::resetCursorStyle();
     }
 }
 
diff --git a/plugins/tools/selectiontools/KisToolSelectMagnetic.h b/plugins/tools/selectiontools/KisToolSelectMagnetic.h
index a1766c8565..1a440222b5 100644
--- a/plugins/tools/selectiontools/KisToolSelectMagnetic.h
+++ b/plugins/tools/selectiontools/KisToolSelectMagnetic.h
@@ -1,95 +1,97 @@
 /*
  *  Copyright (c) 2019 Kuntal Majumder <hellozee@disroot.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program 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 General Public License for more details.
  *
  *  You should have received a copy of the GNU 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 KIS_TOOL_SELECT_MAGNETIC_H_
 #define KIS_TOOL_SELECT_MAGNETIC_H_
 
 #include <QPoint>
 #include "KisSelectionToolFactoryBase.h"
 #include <kis_tool_select_base.h>
 #include <kis_icon.h>
 #include "KisMagneticWorker.h"
 
 class QPainterPath;
 
 class KisToolSelectMagnetic : public KisToolSelect
 {
     Q_OBJECT
 
 public:
     KisToolSelectMagnetic(KoCanvasBase *canvas);
     ~KisToolSelectMagnetic() override;
     void beginPrimaryAction(KoPointerEvent *event) override;
     void continuePrimaryAction(KoPointerEvent *event) override;
     void endPrimaryAction(KoPointerEvent *event) override;
     void paint(QPainter& gc, const KoViewConverter &converter) override;
 
     void keyPressEvent(QKeyEvent *event) override;
     void keyReleaseEvent(QKeyEvent *event) override;
 
     void mouseMoveEvent(KoPointerEvent *event) override;
 
     void resetCursorStyle();
 
 public Q_SLOTS:
     void deactivate() override;
     void activate(KoToolBase::ToolActivation activation, const QSet<KoShape*> &shapes) override;
 
 protected:
     using KisToolSelectBase::m_widgetHelper;
 
 private:
     void finishSelectionAction();
     void updateFeedback();
     void updateContinuedMode();
     void updateCanvas();
 
     QPainterPath m_paintPath;
     QVector<QPointF> m_points;
+    QVector<QPoint> m_anchorPoints;
     bool m_continuedMode;
     QPointF m_lastCursorPos;
     QPoint m_lastAnchor;
     bool m_complete;
     KisMagneticWorker m_worker;
     uint m_checkPoint;
     uint m_radius;
+    QRectF m_snapBound;
 };
 
 class KisToolSelectMagneticFactory : public KisSelectionToolFactoryBase
 {
 public:
     KisToolSelectMagneticFactory()
         : KisSelectionToolFactoryBase("KisToolSelectMagnetic")
     {
         setToolTip(i18n("Magnetic Selection Tool"));
         setSection(TOOL_TYPE_SELECTION);
         setIconName(koIconNameCStr("tool_magnetic_selection"));
         setPriority(8);
         setActivationShapeId(KRITA_TOOL_ACTIVATION_ID);
     }
 
     ~KisToolSelectMagneticFactory() override {}
 
     KoToolBase * createTool(KoCanvasBase *canvas) override {
         return new KisToolSelectMagnetic(canvas);
     }
 };
 
 
 #endif //__selecttoolmagnetic_h__