change organization
cosmetic changes
v 3.4