Update for @str removal