Synced with Nir's mods in main branch