New style and organization
Merge conflict corrected