#20 Upgrade to ES 1.2