Draft 1.9

Modified