Now we need an update for the new model :p