Partial update of leeat comments round 2.