ON 3.5 updated files