Final version with pry removed