Add some comments for comparison with master