Update Tool

Upd to take in consideration the REPLACE user case.