added user id tracking for better analytics