Some text changes & proxy added