Optimise the demo #10 #12