Rebuilt for ECMA3