Second commit of flaming tyrion code