MT-13: Add some comments