v3.2 refactoring sources