about to redo model
...