Support for the new model :)