major structural changes and functionality added