updates to restore previous features and get the tests to pass