Final Refactoring : Context fixing