eric's edits to js