general Update, add latest features from Tab 3