Patch 5.4/Tools