Model major update

Fig is not important.