Change to using the tag directly