added + and @ tags