Improvements - 10-07-16

Improvements - 10-07-16