ADD: change virgin scope to anonymous function