Oops, screwed up last update. Significant improvement in this one