some more efficiency improvements in users