Finally! Working on the Javascript issue