Updated modelling