Improvements - 11-03-16