working, now adding back in replace