Tweaked file to reflect what needs replacement