One final bit (I hope) of make magic