Hao makes some modification on the "model" section