Need to fix @text vs text