Basic modification to run with ApAM 0.0.6 (Nakin Ninja)