Tweaked and updated Lionheart