Prior to user index refactor