performance issue mostly fixed
organization changes