Refactoring scope again..