diff --git a/a/attrs/attrs-19.1.0-Py-3.6.eb b/a/attrs/attrs-19.1.0-Py-3.6.eb
new file mode 100644
index 00000000..4d7d28fc
--- /dev/null
+++ b/a/attrs/attrs-19.1.0-Py-3.6.eb
@@ -0,0 +1,23 @@
+# IT4Innovations 2019
+
+easyblock = 'PythonPackage'
+
+name = 'attrs'
+version = '19.1.0'
+
+homepage = 'http://www.attrs.org/'
+description = 'Classes Without Boilerplate'
+
+toolchain = {'name': 'Py', 'version': '3.6'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+options = {'modulename': 'attr'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python3.6/site-packages/%(name)s-%(version)s-py3.6.egg'],
+}
+
+moduleclass = 'python'
diff --git a/i/IPython/IPython-7.7.0-Py-3.6.eb b/i/IPython/IPython-7.7.0-Py-3.6.eb
index 148d1c2b..70d39a98 100644
--- a/i/IPython/IPython-7.7.0-Py-3.6.eb
+++ b/i/IPython/IPython-7.7.0-Py-3.6.eb
@@ -18,6 +18,8 @@ toolchain = {'name': 'Py', 'version': '3.6'}
 dependencies = [
     ('ZeroMQ', '4.3.1', '', ('GCC', '6.3.0-2.27')),
     ('matplotlib', '3.1.0'),
+    ('Jinja2', '2.10.3'),
+    ('attrs', '19.1.0'),
 ]
 
 use_pip = True
@@ -26,6 +28,15 @@ check_ldshared = True
 exts_default_options = {'source_urls': [PYPI_SOURCE]}
 
 exts_list = [
+    ('decorator', '4.4.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('Pygments', '2.4.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pygments/'],
+    }),
+    ('wheel', '0.33.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/w/wheel/'],
+    }),
     ('ipython_genutils', '0.2.0', {
         'checksums': ['eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8'],
     }),
@@ -145,7 +156,7 @@ exts_list = [
 
 sanity_check_paths = {
     'files': ['bin/ipython'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/IPython'],
+    'dirs': ['lib/python3.6/site-packages/IPython'],
 }
 
 sanity_check_commands = [
diff --git a/j/jupyter-notebook/jupyter-notebook-1.0.0-Py-3.6.eb b/j/jupyter-notebook/jupyter-notebook-1.0.0-Py-3.6.eb
deleted file mode 100644
index fe92dd6a..00000000
--- a/j/jupyter-notebook/jupyter-notebook-1.0.0-Py-3.6.eb
+++ /dev/null
@@ -1,43 +0,0 @@
-# IT4Innovations 2019
-
-easyblock = 'PythonBundle'
-
-name = 'jupyter-notebook'
-version = '1.0.0'
-
-homepage = 'https://pypi.org/project/jupyter/'
-description = "Jupyter system, including the notebook, qtconsole, and the IPython kernel."
-
-toolchain = {'name': 'Py', 'version': '3.6'}
-
-dependencies = [
-    ('IPython', '7.7.0'),
-]
-
-use_pip = True
-
-exts_list = [
-    ('wheel', '0.33.6', {
-        'source_urls': ['https://pypi.python.org/packages/source/w/wheel/'],
-    }),
-    ('notebook', '6.0.2', {
-        'source_urls': ['https://pypi.python.org/packages/source/n/notebook/'],
-    }),
-    ('qtconsole', '4.5.5', {
-        'source_urls': ['https://pypi.python.org/packages/source/q/qtconsole/'],
-    }),
-    ('jupyter_console', '6.0.0', {
-        'source_urls': ['https://pypi.python.org/packages/source/j/jupyter-console/'],
-    }),
-    ('nbconvert', '5.6.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/n/nbconvert/'],
-    }),
-    ('ipykernel', '5.1.3', {
-        'source_urls': ['https://pypi.python.org/packages/source/i/ipykernel/'],
-    }),
-    ('ipywidgets', '7.5.1', {
-        'source_urls': ['https://pypi.python.org/packages/source/i/ipywidgets/'],
-    }),
-]
-
-moduleclass = 'tools'
diff --git a/j/jupyter/jupyter-1.0.0-Py-3.6.eb b/j/jupyter/jupyter-1.0.0-Py-3.6.eb
index dd9434b4..6500d5e0 100644
--- a/j/jupyter/jupyter-1.0.0-Py-3.6.eb
+++ b/j/jupyter/jupyter-1.0.0-Py-3.6.eb
@@ -1,31 +1,47 @@
 # IT4Innovations 2019
 
-easyblock = "PythonPackage"
+easyblock = 'PythonBundle'
+
 name = 'jupyter'
 version = '1.0.0'
 
-homepage = 'https://jupyter.org'
-description = """The Jupyter Notebook is an open-source web application that 
-allows you to create and share documents that contain live code, equations, 
-visualizations and narrative text."""
+homepage = 'https://pypi.org/project/jupyter/'
+description = "Jupyter system, including the notebook, qtconsole, and the IPython kernel."
 
 toolchain = {'name': 'Py', 'version': '3.6'}
 
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-
-patches = ['jupyter-1.0.0-Py-3.6.patch']
-
 dependencies = [
-    ('tornado', '6.0.3'),
-    ('Jinja2', '2.10.3'),
-    ('pandocfilters', '1.4.2'),
-    ('prometheus_client', '0.7.1'),
+    ('IPython', '7.7.0'),
+]
+
+use_pip = True
+
+exts_list = [
+# already in IPython
+#    ('notebook', '6.0.1', {
+#        'source_urls': ['https://pypi.python.org/packages/source/n/notebook/'],
+#    }),
+    ('qtconsole', '4.5.5', {
+        'source_urls': ['https://pypi.python.org/packages/source/q/qtconsole/'],
+    }),
+    ('jupyter_console', '6.0.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/j/jupyter-console/'],
+    }),
+#    ('nbconvert', '5.5.0', {
+#        'source_urls': ['https://pypi.python.org/packages/source/n/nbconvert/'],
+#    }),
+#    ('ipykernel', '5.1.1', {
+#        'source_urls': ['https://pypi.python.org/packages/source/i/ipykernel/'],
+#    }),
+#    ('ipywidgets', '7.5.1', {
+#        'source_urls': ['https://pypi.python.org/packages/source/i/ipywidgets/'],
+#    }),
 ]
 
 sanity_check_paths = {
-    'dirs': [],
-    'files': ['lib/python3.6/site-packages/%(name)s-%(version)s-py3.6sdfk.egg'],
+    'files': [],
+    'dirs': ['lib/python3.6/site-packages/jupyter_console'],
 }
 
-moduleclass = 'python'
+
+moduleclass = 'tools'
diff --git a/n/notebook/notebook-6.0.2-Py-3.6.eb b/n/notebook/notebook-6.0.2-Py-3.6.eb
deleted file mode 100644
index 93f9809a..00000000
--- a/n/notebook/notebook-6.0.2-Py-3.6.eb
+++ /dev/null
@@ -1,30 +0,0 @@
-# IT4Innovations 2019
-
-easyblock = "PythonPackage"
-name = 'notebook'
-version = '6.0.2'
-
-homepage = 'https://pypi.org/project/notebook'
-description = 'The Jupyter Notebook is a web application that allows you to create and share documents that contain live code, equations, visualizations, and explanatory text.'
-
-toolchain = {'name': 'Py', 'version': '3.6'}
-
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-
-#dependencies = [
-#    ('MarkupSafe', '1.1.1'),
-#]
-
-use_pip = True
-
-download_dep_fail = True
-
-options = {'modulename': 'os'}
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['lib/python3.6/site-packages/%(name)s'],
-}
-
-moduleclass = 'python'
diff --git a/s/SDE/SDE-8.35.0.eb b/s/SDE/SDE-8.35.0.eb
new file mode 100644
index 00000000..ffb7f494
--- /dev/null
+++ b/s/SDE/SDE-8.35.0.eb
@@ -0,0 +1,36 @@
+# IT4Innovations 2019
+
+easyblock = 'Tarball'
+
+name = 'SDE'
+version = '8.35.0'
+
+homepage = 'https://software.intel.com/en-us/articles/intel-software-development-emulator'
+description = """
+ Intel Software Development Emulator is a pintool that enables the development of applications using instruction set extensions that are not currently implemented in hardware.
+"""
+toolchain = SYSTEM
+
+# download from
+# https://software.intel.com/en-us/articles/pre-release-license-agreement-for-intel-software-development-emulator-accept-end-user-license-agreement-and-download
+sources = ['sde-external-8.35.0-2019-03-11-lin.tar.bz2']
+
+dependencies = []
+
+skipsteps = ['configure', 'build']
+
+sanity_check_paths = {
+    'files': ['sde', 'xed'],
+    'dirs': [],
+}
+
+# add the top dir to PATH
+modextrapaths = {
+    'PATH': ''
+}
+
+modaliases = {
+    'sde': 'sde64'
+}
+
+moduleclass = 'tools'