Issues pointed out by Emanuel in last mail were completed