ticket:6 Changed JS a little
ticket:6 Changed JS a little