Updating tabs;
Merging class source