Reverted the branch merging into the network back to timestamp based as the set insertion wasn't displaying properly.