Improve 3.2