make replacement more programatically sane
no actual funcionality changes