Basic changes to support issue 5