cleaner design doesn't need tags anymore