Some changes and addings