update to work with default scope