wip updated user views