added user id to returns