Some mainCamp changes