Improvements - 08-17-16

Improvements