New enhancements - 5/8/18

Follow