Finishing includes replacement. Closes #3