more chnages to modeling