some fixes in 10th july