Improvements - 07-25-16

Improvements