finally some more work on the mod xD