new organization and better style
new organization and better style