overhaul to be per-user