modified js #17