[MOD] Some changes