yaniv.rb: more work