Update for @ removal