added user# and stuff