Made equivalent replacements for last pull request