#5 Name change and window.onload bug fix