JS stuffs added