Updating final changes