Updated 3.2 version