diff --git a/a/ATLAS/ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb b/a/ATLAS/ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb
index c839b0f2..e57930b1 100644
--- a/a/ATLAS/ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb
+++ b/a/ATLAS/ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb
@@ -30,7 +30,10 @@ preconfigopts += 'mkdir build && '
 preconfigopts += 'cd build && '
 configure_cmd_prefix = '.'
 configopts = "-Ss f77lib '-L$(EBROOTGCC)/lib64 -lgfortran' "
-configopts += '-b 64  -D c -DPentiumCPS=2500 '
+# salomon
+#configopts += '-b 64  -D c -DPentiumCPS=2500 '
+#anselm
+configopts += '-b 64  -D c -DPentiumCPS=2300 '
 configopts += '--with-netlib-lapack-tarfile=/apps/easybuild/sources/a/ATLAS/lapack-%s.tgz ' % lapackver
 configopts += '-Fa alg -fPIC'
 prebuildopts = 'cd build && ' 
diff --git "a/a/ATLAS/\\" "b/a/ATLAS/\\"
deleted file mode 100644
index f1a3a28d..00000000
--- "a/a/ATLAS/\\"
+++ /dev/null
@@ -1,37 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'ATLAS'
-version = '3.10.3'
-versionsuffix = '-test
-
-homepage = 'http://math-atlas.sourceforge.net'
-description = """ATLAS (Automatically Tuned Linear Algebra Software) is the application of
- the AEOS (Automated Empirical Optimization of Software) paradigm, with the present emphasis 
- on the Basic Linear Algebra Subprograms (BLAS), a widely used, performance-critical, linear 
- algebra kernel library."""
-
-toolchain = {'name': 'GCC', 'version': '7.1.0-2.28'}
-toolchainopts = {'pic': True}
-
-lapackver = '3.6.1'
-versionsuffix = '-LAPACK-%s' % lapackver
-
-source_urls = [
-    ('http://sourceforge.net/projects/math-atlas/files/Stable/%(version)s', 'download'),
-    'http://www.netlib.org/lapack/',
-]
-sources = [
-    '%(namelower)s%(version)s.tar.bz2',
-    'lapack-%s.tgz' % lapackver,
-]
-
-preconfigopts = 'mkdir build && '
-preconfigopts += 'cd build && '
-configure_cmd_prefix = '.'
-configopts = '-Ss f77lib '
-configopts = '-L$(EBROOTGCC)/lib64 -lgfortran ' 
-configopts = '-b 64  -D c -DPentiumCPS=2299 '
-configopts = '--with-netlib-lapack-tarfile=/apps/easybuild/sources/a/ATLAS/lapack-%s.tgz ' % lapackver
-configopts = '-Fa alg -fPIC'
-
-moduleclass = 'numlib'
diff --git a/o/Octave/Octave-4.2.1-intel-2017a-without-X11.eb b/o/Octave/Octave-4.2.1-intel-2017a-without-X11.eb
new file mode 100644
index 00000000..a890f5ba
--- /dev/null
+++ b/o/Octave/Octave-4.2.1-intel-2017a-without-X11.eb
@@ -0,0 +1,54 @@
+easyblock = 'ConfigureMake'
+
+name = 'Octave'
+version = '4.2.1'
+versionsuffix = '-without-X11'
+
+homepage = 'http://www.gnu.org/software/octave/'
+description = """GNU Octave is a high-level interpreted language, primarily intended for numerical computations."""
+
+toolchain = {'name': 'intel', 'version': '2017a'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['%(name)s-%(version)s_intel.patch']
+
+builddependencies = [
+    ('Bison', '3.0.4', '', True),
+    ('flex', '2.6.4', '', True),
+    ('Autotools', '20150215', '', True),
+    ('libtool', '2.4.6', '', True),
+    ('gperf', '3.0.4'),
+]
+
+dependencies = [
+    ('PCRE', '8.40', '', True),
+    ('ncurses', '6.0', '', True),
+    ('libreadline', '7.0', '', True),
+    ('arpack-ng', '3.5.0'),
+    ('cURL', '7.53.1', '', True),
+    ('FLTK', '1.3.4', '', True),
+    ('zlib', '1.2.11', '', True),
+    ('Qt5', '5.8.0', '', ('GCC', '6.3.0-2.27')),
+    ('HDF5', '1.8.18', '-serial'),
+    ('FFTW', '3.3.6'),
+]
+
+configopts = 'MOC=$EBROOTQT5/bin/moc '
+configopts += 'UIC=$EBROOTQT5/bin/uic '
+configopts += 'RCC=$EBROOTQT5/bin/rcc '
+configopts += 'LRELEASE=$EBROOTQT5/bin/lrelease '
+configopts += '--with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK" --disable-docs '
+configopts += '--without-opengl --without-qhull '
+# correct for both GCC and Intel compilers
+configopts += '--enable-fortran-calling-convention=gfortran'
+
+sanity_check_paths = {
+    'files': ['bin/octave'],
+    'dirs': []
+}
+
+sanity_check_commands = [('octave', '--eval "1+2"')]
+
+moduleclass = 'math'