First part of update
Finished update