changes from start working with apache repo till aug 12