major revamp and more intelligent tag selection