user stuff
master merge
master merge