12_23 Did some more work