Add haoya(2345) and fix for 360