update v2

update for unique check, fault tolerance