modified some model