Changed some tag detection timing things... shouldn't matter, but maybe they'll need changed back