Changes to session 4, because errors