Refactored New Session