upgraded to ES 1.3.6