Did some more work...