some model design changes