Patches by McLIve