modifications for 3.2