Changes to make name tags work again...maybe