Updated for post-session 2