A few improvements.  Removed index