now with user stuff