added country and other changes