Replacement complete, but untested