diff --git a/CEP/Calibration/BBSControl/scripts/Makefile.am b/CEP/Calibration/BBSControl/scripts/Makefile.am
index b358f40df96f8b4ca363c66dce25e85203c9cce4..7d1fa365c5322090a65d49753c8e98795157fa5f 100644
--- a/CEP/Calibration/BBSControl/scripts/Makefile.am
+++ b/CEP/Calibration/BBSControl/scripts/Makefile.am
@@ -1,5 +1,5 @@
 lofarpython_PYTHON	= __init__.py solfetch.py solplot.py solflag.py
-lofarpythondir		= $(pythondir)/lofar/sol
+lofarpythondir		= $(pythondir)/lofar/solutions
 libdir			= $(lofarpythondir)
 
 include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSControl/scripts/example_solflag.py b/CEP/Calibration/BBSControl/scripts/example_solflag.py
index 64d2da1c50e82aa09a52a0b6c6044144335be585..977186c23e8a64a6cd21cb6e8aa6994f93a2fdf7 100644
--- a/CEP/Calibration/BBSControl/scripts/example_solflag.py
+++ b/CEP/Calibration/BBSControl/scripts/example_solflag.py
@@ -1,3 +1,3 @@
-import solflag
+import lofar.solutions
 
-solflag.flag("test.MS", "instrument.db", 20, 3.0)
+lofar.solutions.flag("test.MS", "instrument.db", 20, 3.0)
diff --git a/CEP/Calibration/BBSControl/scripts/example_solplot.py b/CEP/Calibration/BBSControl/scripts/example_solplot.py
index 98cfdfb795798c4d62787e1279bcd3bd26fb0833..3b105397c3b5547d9763af5dd95c504ea735dce8 100644
--- a/CEP/Calibration/BBSControl/scripts/example_solplot.py
+++ b/CEP/Calibration/BBSControl/scripts/example_solplot.py
@@ -1,9 +1,9 @@
 import lofar.parmdb
-import solplot
+import lofar.solutions
 
 db = lofar.parmdb.parmdb("instrument.db")
 
 stations = ["CS00%d_HBA%d" % (x,y) for x in [1,8] for y in range(0,4)]
-(ampl, phase) = solplot.fetch(db, stations)
+(ampl, phase) = lofar.solutions.fetch(db, stations)
 
-solplot.plot(ampl)
+lofar.solutions.plot(ampl)
diff --git a/CEP/Calibration/BBSControl/scripts/solflag.py b/CEP/Calibration/BBSControl/scripts/solflag.py
index 69441ddc6add7a3c5d8721887c57f2eb5fb8b47f..92ae71103529595487e7bd339ff6efb5a9bdc4d2 100644
--- a/CEP/Calibration/BBSControl/scripts/solflag.py
+++ b/CEP/Calibration/BBSControl/scripts/solflag.py
@@ -1,7 +1,9 @@
 import sys
+import math
 import numpy
 import pylab
 import pyrap.tables
+import lofar.parmdb
 import solfetch
 
 def flag(msName, dbName, half_window, threshold, sources=None, storeFlags=True,
@@ -122,7 +124,7 @@ def flag(msName, dbName, half_window, threshold, sources=None, storeFlags=True,
                         pylab.clf()
 
                     pylab.subplot("21%d" % (el + 1))
-                    pylab.plot(ampl[el][src][stat], 'k-')
+                    pylab.plot(ampl[el][src][stat], 'r-')
                     pylab.plot(x_axis, sol_masked, 'go', markersize=4)
 
                 # Merge flags based on the solutions for the current direction