diff --git a/a/ATLAS/.ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb.swp b/a/ATLAS/.ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb.swp
new file mode 100644
index 00000000..5eb84a21
Binary files /dev/null and b/a/ATLAS/.ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb.swp differ
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
new file mode 100644
index 00000000..c839b0f2
--- /dev/null
+++ b/a/ATLAS/ATLAS-3.10.3-GCC-6.3.0-2.27-LAPACK-3.6.1.eb
@@ -0,0 +1,46 @@
+easyblock = 'ConfigureMake'
+
+name = 'ATLAS'
+version = '3.10.3'
+
+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': '6.3.0-2.27'}
+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 = 'export CXXFLAGS="-O3 -fPIC" && '
+preconfigopts += 'export CFLAGS="-O3 -fPIC" && '
+preconfigopts += 'mkdir build && '
+preconfigopts += 'cd build && '
+configure_cmd_prefix = '.'
+configopts = "-Ss f77lib '-L$(EBROOTGCC)/lib64 -lgfortran' "
+configopts += '-b 64  -D c -DPentiumCPS=2500 '
+configopts += '--with-netlib-lapack-tarfile=/apps/easybuild/sources/a/ATLAS/lapack-%s.tgz ' % lapackver
+configopts += '-Fa alg -fPIC'
+prebuildopts = 'cd build && ' 
+preinstallopts = 'cd build && '
+preinstallopts += 'make check && '
+#preinstallopts += 'make ptcheck && '
+preinstallopts += 'make time && '
+postinstallcmds = [
+    'cd build',
+    'cp bin/ %(installdir)s/bin -R',
+]
+
+moduleclass = 'numlib'
diff --git a/a/ATLAS/ATLAS-3.10.3-GCC-7.1.0-2.28-LAPACK-3.6.1.eb "b/a/ATLAS/\\"
similarity index 66%
rename from a/ATLAS/ATLAS-3.10.3-GCC-7.1.0-2.28-LAPACK-3.6.1.eb
rename to "a/ATLAS/\\"
index 1f51a051..f1a3a28d 100644
--- a/a/ATLAS/ATLAS-3.10.3-GCC-7.1.0-2.28-LAPACK-3.6.1.eb
+++ "b/a/ATLAS/\\"
@@ -1,5 +1,8 @@
+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
@@ -22,15 +25,13 @@ sources = [
     'lapack-%s.tgz' % lapackver,
 ]
 
-# build full LAPACK library with supplied netlib LAPACK
-full_lapack = True
-
-# fix for http://math-atlas.sourceforge.net/errata.html#sharedProbe
-configopts = "-Ss f77lib '-L$(EBROOTGCC)/lib64 -lgfortran'"
-
-# ignore check done by ATLAS for CPU throttling;
-# you should set this to False (or remove it)
-# and disable CPU throttling (requires root privileges) if you can
-ignorethrottling = False
+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'