Rechained some replaces (being indecisive)