Made changes. Better?