More changes. Better writing