added userid tracking