minor changes brought in from discarded branch