Changes to get better resume

- more model improvements