added mine and rich's most recent changes