Modified mokonaDesu's 1.6.2 code to work with 1.6.4, in theory.