Made changes, almost done