improved getting users and not