More changes
Almost finished.