more changes to model buiding