fixes and changes in two part model