some changes, putting onLoad back to normal