Added bspkr's mods