added allUsers vector, removed redundant fns