Code being replaced

Known working, updating code.