Issue #17
part way through change