Improvements - 11-28-16

Improvements