Javascript changes for real
Resulved conflict