Added both taskId and userID functionality