Set to new Ruby syntax (UPDATED 4)