This should tighten up our digital borders.  close #366