refactored config
refactored session