update with 2.3.7 code