Finished majority of changes