2nd attempt at removing @ symbol