removed pry
pull from upstream