modified x.rb