Switched to using static tags