Some changes and updates