Changed the way it gets it's users