rewrite model
some change