this incorporates few comments of Mila's 2nd revission