Finishing up the changes, almost