The replace should be made here