fixed from before, roles now show up
fixed merge