The previous commit didn't make the right changes. Second attempt