Added some comments, hand off to Mityao