New enhancements - 3/26/18

Follow