major additions in both parts