updated for new scopes