some changes especially jquery