New enhancements - 1/16/18

Follow