Different version

Added the stuff I mentioned in the email -- it seems to be working a little better, but unclear how it will wind up