remove pry
Change logic of Scope