adapting to 3.2