New enhancements - 4/17/18

Follow