Added auto replace back in