diff --git a/uv2000.csv b/uv2000.csv
index 7758736ebc54b3b0491ed8dbfe47b80390951738..1439daa192d776889c287049d15dea743134028f 100644
--- a/uv2000.csv
+++ b/uv2000.csv
@@ -36,20 +36,30 @@ icc/2017.7.259-GCC-6.3.0-2.27,4
 icc/2018.5.274-GCC-6.3.0-2.27,4
 iccifort/2017.1.132-GCC-6.3.0-2.27,4
 iccifort/2017.7.259-GCC-6.3.0-2.27,4
+iccifort/2018.5.274-GCC-6.3.0-2.27,4
 ifort/2017.1.132-GCC-6.3.0-2.27,4
 ifort/2017.7.259-GCC-6.3.0-2.27,4
+ifort/2018.5.274-GCC-6.3.0-2.27,4
 iimpi/2017a,4
 iimpi/2017c,4
+iimpi/2018.04,4
 imkl/2017.1.132-iimpi-2017a,4
 imkl/2017.4.239-iimpi-2017c,4
+imkl/2018.4.274-iimpi-2018.04,4
+imkl/2018.4.274-iompi-2018.04,4
 impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27,4
 impi/2017.4.239-iccifort-2017.7.259-GCC-6.3.0-2.27,4
+impi/2018.4.274-iccifort-2018.5.274-GCC-6.3.0-2.27,4
 intel/2017a,4
 intel/2017c,4
+intel/2018.04,4
+iomkl/2018.04,4
+iompi/2018.04,4
 libdrm/2.4.76,4
 libffi/3.2.1,4
 libpng/1.6.34,4
 libreadline/7.0,4
+LibTIFF/4.0.7,4
 libtool/2.4.6,4
 LibUUID/1.0.3,4
 libxml2/2.9.4,4
@@ -78,6 +88,7 @@ ScaLAPACK/2.0.2-gompi-2017a-OpenBLAS-0.2.19-LAPACK-3.7.0,4
 SCOTCH/6.0.5a-intel-2017a,4
 SQLite/3.17.0,4
 Szip/2.1,4
+tbb/2017.6.196,4
 Tcl/8.6.6,4
 util-linux/2.32,4
 VASP/5.4.4-intel-2017c-mkl=cluster,4
diff --git a/uv2000.md b/uv2000.md
index eefea4ee8169259a2815c7f0ce26810633d0d8c6..836205a0327bd47acf9be82c5a5bcf2fac5bb99e 100644
--- a/uv2000.md
+++ b/uv2000.md
@@ -55,10 +55,12 @@
 | [libffi](http://sourceware.org/libffi/) | The libffi library provides a portable, high level programming interface to various calling conventions. This allows a programmer to call any function specified by a call interface description at run-time. |
 | [libpng](http://www.libpng.org/pub/png/libpng.html) | libpng is the official PNG reference library |
 | [libreadline](http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html) | The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available. The Readline library includes additional functions to maintain a list of previously-entered command lines, to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands. |
+| [LibTIFF](http://download.osgeo.org/libtiff/) | tiff: Library and tools for reading and writing TIFF data files |
 | [libtool](http://www.gnu.org/software/libtool) | GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries behind a consistent, portable interface. |
 | [LibUUID](http://sourceforge.net/projects/libuuid/) | Portable uuid C library |
 | [libxml2](http://xmlsoft.org/) | Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable outside of the Gnome platform). |
 | [nettle](http://www.lysator.liu.se/~nisse/nettle/) | Nettle is a cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space. |
+| [tbb](http://software.intel.com/en-us/articles/intel-tbb/) | Intel Threading Building Blocks 4.0 (Intel TBB) is a widely used, award-winning C++ template library for creating reliable, portable, and scalable parallel applications. Use Intel TBB for a simple and rapid way of developing robust task-based parallel applications that scale to available processor cores, are compatible with multiple environments, and are easier to maintain. Intel TBB is the most proficient way to implement future-proof parallel applications that tap into the power and performance of multicore and manycore hardware platforms. |
 | [zlib](http://www.zlib.net/) | zlib is designed to be a free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library for use on virtually any computer hardware and operating system. |
 
 ## Math
@@ -109,6 +111,8 @@
 | [iccifort](http://software.intel.com/en-us/intel-cluster-toolkit-compiler/) | Intel C, C++ & Fortran compilers |
 | [iimpi](http://software.intel.com/en-us/intel-cluster-toolkit-compiler/) | Intel C/C++ and Fortran compilers, alongside Intel MPI. |
 | [intel](http://software.intel.com/en-us/intel-cluster-toolkit-compiler/) | Compiler toolchain including Intel compilers, Intel MPI and Intel Math Kernel Library (MKL). |
+| [iomkl](http://software.intel.com/en-us/intel-cluster-toolkit-compiler/) | Intel Cluster Toolchain Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MKL & OpenMPI. |
+| [iompi](http://software.intel.com/en-us/intel-cluster-toolkit-compiler/) | Intel C/C++ and Fortran compilers, alongside Open MPI. |
 
 ## Tools