My new setup looking slightly less hackery: