ticket:6 Changed JS a little