Need to fix replace (both of them)