add 2.3.2 support
refactoring