set to new Ruby syntax (UPDATED 2)