convert and close #9 from FarhadG to new format