added scopes, drying up code