another attempt at reorganization of a model