done some more work