Most of the changes are now complete