Added some comments marking changes needed