fixed hardcoded case with user models
pep and bump