merged with eddyfh