Done. It's better, and this is easy to filter users to set now.