Slightly modified version of Aero's mod merged