add partial work on updated models