Upgraded to Ruby v2