Changes on modules from katakrak.net