Moved updating models above