update to 1.2.616, some optimization.