added @nickname changes