user stuff added, untested