models updated. not final yet.