Messed around with #10 some more