Issue #28 redo john's changes