adding back the user stuff