Small Changes.  Faster now