More stuff for session 2.