added user id's and changed some method to reflet that