changes to allow ES5 style