TimAlatorre: Patch 3.3 FTW

Patch 3.3 FTW