some more work done...