[FEATURE] Updated the example code and the WIP for the session for the new situation