diff --git a/notebooks/experiments/DeliveryExercise.ipynb b/notebooks/experiments/DeliveryExercise.ipynb
index a2882722ff196e6b11d36c0e0af3f8b4cca176e6..460b813b45941740e1c4a54da2b0cca2431da295 100644
--- a/notebooks/experiments/DeliveryExercise.ipynb
+++ b/notebooks/experiments/DeliveryExercise.ipynb
@@ -2,7 +2,16 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "nbgrader": {
+     "grade": false,
+     "grade_id": "cell-ca0e2d4a356e7ddd",
+     "locked": true,
+     "schema_version": 3,
+     "solution": false,
+     "task": false
+    }
+   },
    "source": [
     "# Exercice Sheet: B Expressions\n",
     "\n",
@@ -20,7 +29,15 @@
    "execution_count": 25,
    "metadata": {
     "deletable": false,
-    "editable": false
+    "editable": false,
+    "nbgrader": {
+     "grade": false,
+     "grade_id": "cell-9e087aee8a95121b",
+     "locked": true,
+     "schema_version": 3,
+     "solution": false,
+     "task": false
+    }
    },
    "outputs": [
     {
@@ -52,7 +69,16 @@
   {
    "cell_type": "code",
    "execution_count": 26,
-   "metadata": {},
+   "metadata": {
+    "nbgrader": {
+     "grade": false,
+     "grade_id": "cell-bfffcdda64188e4c",
+     "locked": true,
+     "schema_version": 3,
+     "solution": false,
+     "task": false
+    }
+   },
    "outputs": [
     {
      "data": {
@@ -71,14 +97,32 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "nbgrader": {
+     "grade": false,
+     "grade_id": "cell-46338618f1b7edff",
+     "locked": true,
+     "schema_version": 3,
+     "solution": false,
+     "task": false
+    }
+   },
    "source": [
     "The above machine also contains particular instantiations of the above sets and relations, which will be used in the exercises below."
    ]
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "nbgrader": {
+     "grade": false,
+     "grade_id": "cell-44701490d6a9260e",
+     "locked": true,
+     "schema_version": 3,
+     "solution": false,
+     "task": false
+    }
+   },
    "source": [
     "## Exercise 1\n",
     "Write a B expression to compute the set of clients that have ordered article a5. Use the ```:let sol1 EXPRESSION``` in the cell below."
@@ -87,7 +131,16 @@
   {
    "cell_type": "code",
    "execution_count": 16,
-   "metadata": {},
+   "metadata": {
+    "nbgrader": {
+     "grade": false,
+     "grade_id": "cell-bab176fbf0a75b6f",
+     "locked": false,
+     "schema_version": 3,
+     "solution": true,
+     "task": false
+    }
+   },
    "outputs": [
     {
      "data": {
@@ -110,7 +163,17 @@
   {
    "cell_type": "code",
    "execution_count": 20,
-   "metadata": {},
+   "metadata": {
+    "nbgrader": {
+     "grade": true,
+     "grade_id": "cell-2b74a8ed88e60492",
+     "locked": true,
+     "points": 0,
+     "schema_version": 3,
+     "solution": false,
+     "task": false
+    }
+   },
    "outputs": [
     {
      "ename": "CommandExecutionException",
@@ -127,7 +190,16 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "nbgrader": {
+     "grade": false,
+     "grade_id": "exercise_2",
+     "locked": true,
+     "schema_version": 3,
+     "solution": false,
+     "task": false
+    }
+   },
    "source": [
     "## Exercise 2\n",
     "Write a B expression which computes the set of all articles ordered by at least one client. Use the ```:let sol2 EXPRESSION``` in the cell below."
@@ -136,7 +208,16 @@
   {
    "cell_type": "code",
    "execution_count": 22,
-   "metadata": {},
+   "metadata": {
+    "nbgrader": {
+     "grade": false,
+     "grade_id": "cell-5fb80f74fa97df15",
+     "locked": false,
+     "schema_version": 3,
+     "solution": true,
+     "task": false
+    }
+   },
    "outputs": [
     {
      "data": {
@@ -159,7 +240,17 @@
   {
    "cell_type": "code",
    "execution_count": 23,
-   "metadata": {},
+   "metadata": {
+    "nbgrader": {
+     "grade": true,
+     "grade_id": "cell-b1cc285b1a32f2bd",
+     "locked": true,
+     "points": 0,
+     "schema_version": 3,
+     "solution": false,
+     "task": false
+    }
+   },
    "outputs": [
     {
      "data": {
@@ -182,7 +273,17 @@
   {
    "cell_type": "code",
    "execution_count": 24,
-   "metadata": {},
+   "metadata": {
+    "nbgrader": {
+     "grade": true,
+     "grade_id": "cell-94e08eff5d6d66bf",
+     "locked": true,
+     "points": 0,
+     "schema_version": 3,
+     "solution": false,
+     "task": false
+    }
+   },
    "outputs": [
     {
      "ename": "CommandExecutionException",
@@ -225,7 +326,7 @@
   }
  ],
  "metadata": {
-  "celltoolbar": "Edit Metadata",
+  "celltoolbar": "Create Assignment",
   "kernelspec": {
    "display_name": "ProB 2",
    "language": "prob",