fix
continue main modeling