Applied recommendations from mrnuke