base context refactored
base context refactored