Partial upgrade of functionality to tab 1
and again to finish last update