Some changes and making more clear