model improvements