adjusted to new models