Insert or update (7/28)

Insert or update