refactored scopes