Streamlined code to I hope make it quicker.  The added hash code should give the main boost.