* Fixing error where all users (present and past where drawn)