[MOD] Required changes