Some changes in fourth branch