pull in Jing's model fixes