upgraded to ES 0.90.7