Updated modeling