Again.. Some changes