Changes from lab session 22 april