making work with new model structure