Patches by Tony Guzman
_