updated to newly and performant ES5Class