Revert "Revert "Update change 3""

This reverts commit 2f74c95bc1c37aaf90a63eb6ce17d44b1e561b78.