Fourth session refactored