yes both have been replaced