2014-4-14 added and modified some models