issue #2: updated to include historical users