Improvements - 09-13-16

Improvements