Improved JavaScript #7