Finished update to v1.0